diff --git a/src-modules/module/rpta/masken/48110_felderinfo.unl b/src-modules/module/rpta/masken/48110_felderinfo.unl
index 2f66733..6ed66ae 100644
--- a/src-modules/module/rpta/masken/48110_felderinfo.unl
+++ b/src-modules/module/rpta/masken/48110_felderinfo.unl
@@ -14,14 +14,14 @@ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rp
 48113^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
 48114^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^
 48115^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<<SQL>>  select 2,'nur Wintersemester' from xdummy^
-48116^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^
+48116^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^999^hs_zugangsber^apnr, eintrag^ ^
 48117^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
-48118^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^
+48118^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^999^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^
 48119^Studiengang^25^0^0^140^150^50^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^
-48121^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende';^ ^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
-48122^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<<SQL>> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
-48128^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-48132^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
+48121^Stichtag^23^330^-1^130^100^1^sql^30^1^999^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende';^ ^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
+48122^Hörerstatus^200^330^-1^140^150^1^sql^30^0^999^<<SQL>> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
+48128^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^999^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
+48132^Geschlecht^110^0^0^140^80^1^integer^30^0^999^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
 48133^Spalten^3001^0^0^150^190^10^char^30^0^1^<<SQL>>\
 select C.uniquename, C.caption ,L.layout_id from rpta_column C, rpta_column2layout L where C.tid=L.column_id and layout_id in\
 (select tid from rpta_column_layout where uniquename=<<Spaltenlayout>>) order by 2;^ ^ ^
diff --git a/src-modules/module/rpta/masken/48110_maskeninfo.unl b/src-modules/module/rpta/masken/48110_maskeninfo.unl
index dbd6ff9..e9e9a00 100644
--- a/src-modules/module/rpta/masken/48110_maskeninfo.unl
+++ b/src-modules/module/rpta/masken/48110_maskeninfo.unl
@@ -68,9 +68,11 @@ order by CL.sortnr\
 /* and sem_der_pruefung <= <<Bis Semester>> */\
 /* and sem_der_pruefung = <<Semester>> */\
 /* and substring('' || sem_der_pruefung from 5 for 1)='<<Semestertyp>>' */\
+/* and fach_sem_zahl <= <<bis Fachsemester>>  */\
 " />\
 \
 <#assign filter = filter + " and 's_' || tid_stg in "+Studiengang.allNeededKeysList /> \
+<#assign filter = filter + " and tid_stg in (select tid from lehr_stg_ab where stg in "+Fächer.allNeededKeysList +")"/> \
 \
 <#if columns?has_content>\
 \