diff --git a/src-modules/module/etl/schluesseltabellen/create_load_etl_rpta_column_layout.sql b/src-modules/module/etl/schluesseltabellen/create_load_etl_rpta_column_layout.sql
index 68e315a..05eb414 100644
--- a/src-modules/module/etl/schluesseltabellen/create_load_etl_rpta_column_layout.sql
+++ b/src-modules/module/etl/schluesseltabellen/create_load_etl_rpta_column_layout.sql
@@ -57,11 +57,10 @@ CREATE TABLE tmp_rpta_column2layout (
     sortnr smallint,
     is_visible smallint,
     visible_size smallint,
+    format_code varchar(255),
     targetfieldname character varying(255),
     caption character varying(255),
-    description text,
-    format_code character varying(255),
-    format_code_id integer
+    description text
 );
 
 
diff --git a/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql b/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql
index 0eb01fe..54a62cf 100644
--- a/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql
+++ b/src-modules/module/etl/schluesseltabellen/etl_step_fuellen.sql
@@ -236,7 +236,16 @@
   {"etl_step":"unload_rpta_resultset_tab","prop_name":"select_stmt", "prop_value":"SELECT R.* from rpta_resultset R where R.tid in (select L.resultset_id from rpta_column_layout L where L.tid= $RPTA_COLUMN_LAYOUT_TID ) order by 1;" },
   {"etl_step":"unload_rpta_column_layout_tab","prop_name":"select_stmt", "prop_value":"SELECT L.*,R.uniquename as resultset_uniquename from rpta_column_layout L, rpta_resultset R where R.tid=L.resultset_id and L.tid= $RPTA_COLUMN_LAYOUT_TID order by 1;" },
   {"etl_step":"unload_rpta_column_tab","prop_name":"select_stmt", "prop_value":"select * from rpta_column where tid in (select column_id from rpta_column2layout L where L.layout_id = $RPTA_COLUMN_LAYOUT_TID ) order by 1;" },
-  {"etl_step":"unload_rpta_column2layout_tab","prop_name":"select_stmt", "prop_value":"select * from rpta_column2layout L where L.layout_id = $RPTA_COLUMN_LAYOUT_TID order by 1;" },
+  {"etl_step":"unload_rpta_column2layout_tab","prop_name":"select_stmt", "prop_value":"select L.tid,
+       L.column_id,
+       L.layout_id,
+       L.sortnr,
+       L.is_visible,
+       L.visible_size,
+       F.uniquename as format_code,
+       L.targetfieldname,
+       L.caption,
+       L.description from rpta_column2layout L  left outer join rpta_format_code F on (F.tid=L.format_code_id) where L.layout_id = $RPTA_COLUMN_LAYOUT_TID order by 1;" },
 
   {"etl_step":"create_tmp_rpta_column_layout","prop_name":"PATH_TO_INPUTFILE", "prop_value":"$SUPERX_DIR/db/module/etl/schluesseltabellen/create_load_etl_rpta_column_layout.sql" },
   
diff --git a/src-modules/module/etl/schluesseltabellen/trans_rpta_column_layout.sql b/src-modules/module/etl/schluesseltabellen/trans_rpta_column_layout.sql
index 085863f..715e057 100644
--- a/src-modules/module/etl/schluesseltabellen/trans_rpta_column_layout.sql
+++ b/src-modules/module/etl/schluesseltabellen/trans_rpta_column_layout.sql
@@ -8,7 +8,7 @@
 select uniquename,
 caption,
 resultset_uniquename as rpta_resultset,
-whereclause,
+replace(whereclause,'''','''''') as whereclause,
 description,
 sortclause,
 is_virtual
@@ -22,7 +22,7 @@ L.caption as caption_in_ergebnistabelle,
 C.srcfieldname,
 C.targetfieldname,
 T.uniquename as column_type,
-C.col_function,
+replace(C.col_function,'''','''''') as col_function,
 L.is_visible,
 L.visible_size,
 C.is_aggregate,