diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index 6f5cd50..c50c8b1 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -717,7 +717,6 @@ gueltig_bis DATE
         <!--<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.sql" database="" />-->
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_cob_busa_aggr_stamm_kost_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database="" />
-        <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sx_repository_fuellen.sql" database=""/>
       </action>
     </install-step>
   </install>
@@ -825,7 +824,6 @@ gueltig_bis DATE
         <!--<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.sql" database="" />-->
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_cob_busa_aggr_stamm_kost_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database="" />
-        <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sx_repository_fuellen.sql" database=""/>
       </action>
     </upgrade-step>
   </upgrade>
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
index 00f564a..5db6b9c 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
@@ -57,15 +57,29 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_soll",
+{"uniquename":"ects_soll_prep",
+"caption_in_ergebnistabelle":"Soll-ECTS",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_soll_max",
 "caption_in_ergebnistabelle":"Soll-ECTS",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_ist",
-"caption_in_ergebnistabelle":"Ist-ECTS",
+{"uniquename":"ects_ist_prep",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_ist_max",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
index 8fbd1e7..62f1fde 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
@@ -50,14 +50,28 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_soll",
+{"uniquename":"ects_soll_prep",
+"caption_in_ergebnistabelle":"Soll-ECTS",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_soll_max",
 "caption_in_ergebnistabelle":"Soll-ECTS",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_ist",
+{"uniquename":"ects_ist_prep",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_ist_max",
 "caption_in_ergebnistabelle":"Ist-ECTS gesamt",
 "is_visible":"1",
 "format_code":"",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
index 35a9720..94300c8 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
@@ -13,7 +13,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 	and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40)
 		or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))",
 "description":"",
-"sortclause":"ects_ist/ects_soll desc,note_elementnr_30,note_pnr_30"
+"sortclause":"ects_ist_max/ects_soll_max desc,note_elementnr_30,note_pnr_30"
 }
    />
 
@@ -40,15 +40,43 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_soll",
+{"uniquename":"dim_studiengang_stg",
+"caption_in_ergebnistabelle":"Fach",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"dim_studiengang_abschluss",
+"caption_in_ergebnistabelle":"Abschluss",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_soll_prep",
+"caption_in_ergebnistabelle":"Soll-ECTS",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_soll_max",
 "caption_in_ergebnistabelle":"Soll-ECTS",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_ist",
-"caption_in_ergebnistabelle":"Ist-ECTS",
+{"uniquename":"ects_ist_prep",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_ist_max",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
index 6a0e7d3..09b9748 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
@@ -13,7 +13,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 	and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40)
 		or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))",
 "description":"",
-"sortclause":"ects_ist/ects_soll desc,note_elementnr_30,note_pnr_30"
+"sortclause":"ects_ist_max/ects_soll_max desc,note_elementnr_30,note_pnr_30"
 }
    />
 
@@ -40,22 +40,29 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_soll",
+{"uniquename":"ects_soll_prep",
 "caption_in_ergebnistabelle":"Soll-ECTS",
-"is_visible":"1",
+"is_visible":"0",
 "format_code":"",
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"ects_ist",
-"caption_in_ergebnistabelle":"Ist-ECTS",
+{"uniquename":"ects_soll_max",
+"caption_in_ergebnistabelle":"Soll-ECTS",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
-{"uniquename":"dim_studiengang_abschluss",
-"caption_in_ergebnistabelle":"Abschluss",
+{"uniquename":"ects_ist_prep",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
+{"uniquename":"ects_ist_max",
+"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
@@ -68,6 +75,13 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "visible_size":"5",
 "description_in_ergebnistabelle":""
 },
+{"uniquename":"dim_studiengang_abschluss",
+"caption_in_ergebnistabelle":"Abschluss",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"description_in_ergebnistabelle":""
+},
 {"uniquename":"dim_studiengang_pversion_uniquename",
 "caption_in_ergebnistabelle":"PO-Version",
 "is_visible":"1",
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
index 544110c..06b45a7 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
@@ -160,7 +160,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
 "srcfieldname":"",
 "targetfieldname":"ects_ist_anteil",
 "column_type":"computedColumn",
-"col_function":"(ects_ist/ects_soll*100)",
+"col_function":"(ects_ist_max/ects_soll_max*100)",
 "is_aggregate":"1",
 "description_der_spalte":"Anteil der Ist-ECTS and den Soll-ECTS"
 },
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
index c20b018..df9aac3 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
@@ -23,6 +23,7 @@ select tid, table_name,
        name as targetname
        from sx_fields where table_name ='${fact_table_source}'
        and currentlyused=1
+       and name not like '%_gew' --keine Lehrverflechtung, wird nur fürs MKW NRW genutzt
        <#foreach added_table in added_tables>
        union
        select tid,table_name,
@@ -217,7 +218,7 @@ joinclause='${fact_table_source}
 <#foreach added_table in added_tables>
 left outer join ${added_table.name} on (${added_table.joinclause})
 </#foreach>',
-whereclause='';
+whereclause='(lehr_eigen=lehr_dienst or (lehr_eigen is null and lehr_dienst is null)) and aktiv=1';
 
 select * into temp tmp_rs1 
 from rpta_resultset
diff --git a/src-modules/module/rpta/schluesseltabellen/sx_repository.unl b/src-modules/module/rpta/schluesseltabellen/sx_repository.unl
index 0cffe3c..34e7078 100644
--- a/src-modules/module/rpta/schluesseltabellen/sx_repository.unl
+++ b/src-modules/module/rpta/schluesseltabellen/sx_repository.unl
@@ -1,2 +1,2 @@
-1^RPTA_SOS_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^331^1^0^0^^1^01.01.1900^31.12.3000^
-2^RPTA_LM_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^331^1^0^0^^1^01.01.1900^31.12.3000^
+1^RPTA_SOS_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^330^1^0^0^^1^01.01.1900^31.12.3000^
+2^RPTA_LM_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^330^1^0^0^^1^01.01.1900^31.12.3000^