diff --git a/src-modules/module/sxc/masken/47000_maskeninfo.unl b/src-modules/module/sxc/masken/47000_maskeninfo.unl
index adef342..800286c 100644
--- a/src-modules/module/sxc/masken/47000_maskeninfo.unl
+++ b/src-modules/module/sxc/masken/47000_maskeninfo.unl
@@ -62,8 +62,9 @@ sum(gesamt),\
        sum(w_gesamt),\
        sum(nicht_a_gesamt),\
        sum(a_gesamt)\
-from tmp_studis1 S, kenn_semester K\
-where K.tid=S.semester\
+from tmp_studis1 S, cif K\
+where K.key=661\
+and K.apnr=S.semester\
 group by 1,2;\
 drop table tmp_studis1;\
 \
diff --git a/src-modules/module/sxc/masken/47060_felderinfo.unl b/src-modules/module/sxc/masken/47060_felderinfo.unl
index 17a8756..b05ca5a 100644
--- a/src-modules/module/sxc/masken/47060_felderinfo.unl
+++ b/src-modules/module/sxc/masken/47060_felderinfo.unl
@@ -1,6 +1,42 @@
 47060^Hochschule^0^0^0^100^150^3^char^30^0^12^<<SQL>> select tid, type, name,sortnr from sichten where art in('SXC_Hochschulen-Sicht') order by sortnr, name;^^ ^
-47061^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^^<<SQL>> select tid,druck from kenn_semester where today() between sem_beginn  and sem_ende;^
-47062^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> select tid,druck from kenn_semester where tid in (select semester from sxc_stud_sem_da_geschl_hs) order by tid DESC;^ ^<<SQL>> select tid,druck from kenn_semester where today() between sem_beginn  and sem_ende;^
+47061^Seit Semester^1^0^0^130^80^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC;\
+^^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^
+47062^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> WITH aktuelles_semester AS (\
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1\
+)\
+SELECT c.apnr,c.druck\
+FROM cif c\
+JOIN aktuelles_semester a\
+  ON c.apnr <= a.apnr\
+WHERE c.key = 661\
+ORDER BY c.apnr DESC;\
+^ ^<<SQL>> \
+    SELECT apnr\
+    FROM cif\
+    WHERE key = 661\
+      AND today() BETWEEN d_akt_von AND d_akt_bis\
+    LIMIT 1^
 47071^Geschlecht^37^0^0^140^80^1^char^30^0^1^<<SQL>> select apnr, name from xcube_dims where id='auspraegung_code_3' order by 1^hidden^^
 47072^Felder^125^0^0^150^190^10^char^30^0^999^<<SQL>>\
 --freemarker template\
diff --git a/src-modules/module/sxc/schluesseltabellen/xcube_install.sql b/src-modules/module/sxc/schluesseltabellen/xcube_install.sql
index 9500fa7..db283b1 100644
--- a/src-modules/module/sxc/schluesseltabellen/xcube_install.sql
+++ b/src-modules/module/sxc/schluesseltabellen/xcube_install.sql
@@ -42,10 +42,11 @@
     "name":"semester",
     "caption":"Semester",
     "is_coldefault":1,
-    "foreignkey_tab":"kenn_semester",
-    "foreignkey_col":"tid",
+    "foreignkey_tab":"cif",
+    "foreignkey_col":"apnr",
     "foreignkey_cap":"druck",
-    "sortfield":"tid",
+    "foreignkey_cond":"key=661",
+    "sortfield":"apnr",
     "calc_gesamt":0},
        {"maskeninfo_id":47030, 
     "name":"hs_nr",
@@ -75,10 +76,11 @@
     "name":"semester",
     "caption":"Semester",
     "is_coldefault":1,
-    "foreignkey_tab":"kenn_semester",
-    "foreignkey_col":"tid",
+    "foreignkey_tab":"cif",
+    "foreignkey_col":"apnr",
     "foreignkey_cap":"druck",
-    "sortfield":"tid",
+    "foreignkey_cond":"key=661",
+    "sortfield":"apnr",
     "calc_gesamt":0},
        {"maskeninfo_id":47060, 
     "name":"hs_nr",