diff --git a/src-modules/module/rpta/masken/48080_maskeninfo.unl b/src-modules/module/rpta/masken/48080_maskeninfo.unl
index c52a626..d9803de 100644
--- a/src-modules/module/rpta/masken/48080_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48080_maskeninfo.unl
@@ -49,10 +49,12 @@ C.is_aggregate,\
 (case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
 CL.is_visible,\
 CL.visible_size as visible_width,\
-(select F.sql_code from rpta_format_code F where F.tid=CL.format_code_id) as format_sql,\
+F.sql_code as format_sql,\
+F.uniquename as format_uniquename,\
 C.col_function as colfunction,\
 (case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L, rpta_column2layout CL, rpta_column C, rpta_column_type T\
+FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
+left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
 where L.tid=CL.layout_id\
 and C.tid=CL.column_id\
 and T.tid=C.column_type\
diff --git a/src-modules/module/rpta/masken/48110_maskeninfo.unl b/src-modules/module/rpta/masken/48110_maskeninfo.unl
index fd759bb..c2cee3c 100644
--- a/src-modules/module/rpta/masken/48110_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48110_maskeninfo.unl
@@ -50,10 +50,12 @@ C.is_aggregate,\
 (case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
 CL.is_visible,\
 CL.visible_size as visible_width,\
-(select F.sql_code from rpta_format_code F where F.tid=CL.format_code_id) as format_sql,\
+F.sql_code as format_sql,\
+F.uniquename as format_uniquename,\
 C.col_function as colfunction,\
 (case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L, rpta_column2layout CL, rpta_column C, rpta_column_type T\
+FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
+left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
 where L.tid=CL.layout_id\
 and C.tid=CL.column_id\
 and T.tid=C.column_type\
diff --git a/src-modules/module/rpta/masken/48180_maskeninfo.unl b/src-modules/module/rpta/masken/48180_maskeninfo.unl
index 8dc99ab..d16b409 100644
--- a/src-modules/module/rpta/masken/48180_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48180_maskeninfo.unl
@@ -51,10 +51,12 @@ C.is_aggregate,\
 (case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
 CL.is_visible,\
 CL.visible_size as visible_width,\
-(select F.sql_code from rpta_format_code F where F.tid=CL.format_code_id) as format_sql,\
+F.sql_code as format_sql,\
+F.uniquename as format_uniquename,\
 C.col_function as colfunction,\
 (case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L, rpta_column2layout CL, rpta_column C, rpta_column_type T\
+FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
+left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
 where L.tid=CL.layout_id\
 and C.tid=CL.column_id\
 and T.tid=C.column_type\
diff --git a/src-modules/module/rpta/masken/48220_maskeninfo.unl b/src-modules/module/rpta/masken/48220_maskeninfo.unl
index f62ae0a..1c08df2 100644
--- a/src-modules/module/rpta/masken/48220_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48220_maskeninfo.unl
@@ -55,10 +55,12 @@ C.is_aggregate,\
 (case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
 CL.is_visible,\
 CL.visible_size as visible_width,\
-(select F.sql_code from rpta_format_code F where F.tid=CL.format_code_id) as format_sql,\
+F.sql_code as format_sql,\
+F.uniquename as format_uniquename,\
 C.col_function as colfunction,\
 (case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L, rpta_column2layout CL, rpta_column C, rpta_column_type T\
+FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
+left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
 where L.tid=CL.layout_id\
 and C.tid=CL.column_id\
 and T.tid=C.column_type\
diff --git a/src-modules/module/rpta/masken/48280_maskeninfo.unl b/src-modules/module/rpta/masken/48280_maskeninfo.unl
index 325eee5..563b294 100644
--- a/src-modules/module/rpta/masken/48280_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48280_maskeninfo.unl
@@ -55,10 +55,12 @@ C.is_aggregate,\
 (case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
 CL.is_visible,\
 CL.visible_size as visible_width,\
-(select F.sql_code from rpta_format_code F where F.tid=CL.format_code_id) as format_sql,\
+F.sql_code as format_sql,\
+F.uniquename as format_uniquename,\
 C.col_function as colfunction,\
 (case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L, rpta_column2layout CL, rpta_column C, rpta_column_type T\
+FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
+left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
 where L.tid=CL.layout_id\
 and C.tid=CL.column_id\
 and T.tid=C.column_type\