diff --git a/src-modules/module/rpta/masken/48000_maskeninfo.unl b/src-modules/module/rpta/masken/48000_maskeninfo.unl
index 28aee43..070dccd 100644
--- a/src-modules/module/rpta/masken/48000_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48000_maskeninfo.unl
@@ -29,26 +29,12 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48080_maskeninfo.unl b/src-modules/module/rpta/masken/48080_maskeninfo.unl
index d9803de..01fc88f 100644
--- a/src-modules/module/rpta/masken/48080_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48080_maskeninfo.unl
@@ -21,46 +21,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.tid=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.tid=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 </sqlvars>\
diff --git a/src-modules/module/rpta/masken/48110_maskeninfo.unl b/src-modules/module/rpta/masken/48110_maskeninfo.unl
index 2e78ea4..23c4b31 100644
--- a/src-modules/module/rpta/masken/48110_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48110_maskeninfo.unl
@@ -21,47 +21,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 </sqlvars>\
diff --git a/src-modules/module/rpta/masken/48180_maskeninfo.unl b/src-modules/module/rpta/masken/48180_maskeninfo.unl
index 899a7a4..2b257a2 100644
--- a/src-modules/module/rpta/masken/48180_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48180_maskeninfo.unl
@@ -32,37 +32,16 @@ L.is_virtual,\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.runtime_tablename}';\
 \
 ]]></sqlvar>\
 \
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48220_maskeninfo.unl b/src-modules/module/rpta/masken/48220_maskeninfo.unl
index 1207b58..1cf53ec 100644
--- a/src-modules/module/rpta/masken/48220_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48220_maskeninfo.unl
@@ -26,47 +26,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48250_maskeninfo.unl b/src-modules/module/rpta/masken/48250_maskeninfo.unl
index 4fcc9ca..c2ec8d5 100644
--- a/src-modules/module/rpta/masken/48250_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48250_maskeninfo.unl
@@ -21,47 +21,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 </sqlvars>\
diff --git a/src-modules/module/rpta/masken/48280_maskeninfo.unl b/src-modules/module/rpta/masken/48280_maskeninfo.unl
index 95b208e..d918563 100644
--- a/src-modules/module/rpta/masken/48280_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48280_maskeninfo.unl
@@ -26,47 +26,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48310_maskeninfo.unl b/src-modules/module/rpta/masken/48310_maskeninfo.unl
index 34aca69..6a6a62f 100644
--- a/src-modules/module/rpta/masken/48310_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48310_maskeninfo.unl
@@ -29,48 +29,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48430_maskeninfo.unl b/src-modules/module/rpta/masken/48430_maskeninfo.unl
index 471336d..d1ebbad 100644
--- a/src-modules/module/rpta/masken/48430_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48430_maskeninfo.unl
@@ -29,48 +29,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48460_maskeninfo.unl b/src-modules/module/rpta/masken/48460_maskeninfo.unl
index f04ac26..abaa081 100644
--- a/src-modules/module/rpta/masken/48460_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48460_maskeninfo.unl
@@ -29,48 +29,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="jahr_filter" ><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48490_maskeninfo.unl b/src-modules/module/rpta/masken/48490_maskeninfo.unl
index 97a5d89..97cac4b 100644
--- a/src-modules/module/rpta/masken/48490_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48490_maskeninfo.unl
@@ -26,48 +26,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48520_maskeninfo.unl b/src-modules/module/rpta/masken/48520_maskeninfo.unl
index d42d15a..147271c 100644
--- a/src-modules/module/rpta/masken/48520_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48520_maskeninfo.unl
@@ -26,48 +26,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 <sqlvar name="endsemester"><![CDATA[\
diff --git a/src-modules/module/rpta/masken/48550_maskeninfo.unl b/src-modules/module/rpta/masken/48550_maskeninfo.unl
index c81c0ea..1bf0ad3 100644
--- a/src-modules/module/rpta/masken/48550_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48550_maskeninfo.unl
@@ -29,48 +29,19 @@ name as runtime_tablename\
     ]]>\
 </sqlvar>\
 <sqlvar name="rpta_resultset" type="hash"><![CDATA[\
-select  caption,\
-       uniquename,\
-       fieldclause,\
-       joinclause,\
-       whereclause,\
-       systeminfo_id\
-       from rpta_resultset\
+select * from rpta_resultset\
        where uniquename='${basetable.name}';\
 \
 ]]></sqlvar>\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
-select L.uniquename,\
-       L.caption,\
-       L.whereclause,\
-       R.is_virtual,\
-       L.sortclause\
-       from rpta_resultset R, rpta_column_layout L\
-       where L.resultset_id=R.tid\
-       and R.uniquename='${basetable.name}'\
-       and L.uniquename=<<Spaltenlayout>>;\
+       SELECT * from sp_rpta_column_layout('${basetable.name}',<<Spaltenlayout>>::varchar(255));\
 \
 ]]></sqlvar>\
 <sqlvar name="columns" type="hashsequence"><![CDATA[\
-SELECT C.srcfieldname,\
-(case when string_not_null(C.targetfieldname)='' then C.srcfieldname else C.targetfieldname end) as targetfieldname,\
-T.uniquename as coltype,\
-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,\
-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_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\
-and L.uniquename=<<Spaltenlayout>>\
-/* and C.uniquename in (<<Spalten>>) */\
-order by CL.sortnr\
+SELECT * from sp_rpta_columns_in_layout(<<Spaltenlayout>>::varchar(255))\
+where 1=1\
+/* and column_uniquename in (<<Spalten>>) */\
+order by sortnr\
  ;\
 ]]></sqlvar>\
 \
diff --git a/src-modules/module/rpta/prozeduren/proc_get_rpta_column_layout_p.sql b/src-modules/module/rpta/prozeduren/proc_get_rpta_column_layout_p.sql
new file mode 100644
index 0000000..e5ead65
--- /dev/null
+++ b/src-modules/module/rpta/prozeduren/proc_get_rpta_column_layout_p.sql
@@ -0,0 +1,23 @@
+
+DROP FUNCTION if exists sp_rpta_column_layout(character varying,character varying) ;
+
+CREATE FUNCTION sp_rpta_column_layout(p_resultset_uniquename varchar(255), p_column_layout_uniquename varchar(255))
+RETURNS TABLE(uniquename  varchar(255),
+caption varchar(255),
+whereclause text,
+is_virtual smallint,
+sortclause text
+) AS '
+BEGIN
+    RETURN QUERY select L.uniquename,
+       L.caption,
+       L.whereclause,
+       R.is_virtual,
+       L.sortclause
+       from rpta_resultset R, rpta_column_layout L
+       where L.resultset_id=R.tid
+       and R.uniquename=p_resultset_uniquename
+       and L.uniquename=p_column_layout_uniquename;
+END;
+' LANGUAGE plpgsql;
+