diff --git a/APPL/API2/model_cnt_kenmerk.inc b/APPL/API2/model_cnt_kenmerk.inc
index 3270654c74..086a53589d 100644
--- a/APPL/API2/model_cnt_kenmerk.inc
+++ b/APPL/API2/model_cnt_kenmerk.inc
@@ -83,9 +83,8 @@ function model_cnt_kenmerk()
             "label": L("mgt_kenmerk_niveau"),
             "typ": "varchar",
             "hidden_fld": true,
-            "defaultvalue": "S",
             "LOV": fill_cnt_niveau_LOV(),
-            "defaultvalue": "D"
+            "defaultvalue": "S"
         },
         "sequence": {
             "dbs": "cnt_kenmerk_volgnummer",
diff --git a/APPL/API2/model_cnt_srtkenmerk.inc b/APPL/API2/model_cnt_srtkenmerk.inc
index 6780555f28..5f6e96d5f6 100644
--- a/APPL/API2/model_cnt_srtkenmerk.inc
+++ b/APPL/API2/model_cnt_srtkenmerk.inc
@@ -21,8 +21,8 @@ function model_cnt_srtkenmerk()
     this.record_name = "cnt_srtkenmerk";
     this.soft_delete = "cnt_srtkenmerk_verwijder";
     this.autfunction = "WEB_CNTMGT";
-    this.record_title = L("cnt_srtkenmerk");
-    this.records_title = L("cnt_srtkenmerk_m");
+    this.record_title = L("mgt_srtkenmerk");
+    this.records_title = L("mgt_srtkenmerk_m");
 
 
     this.fields = {
diff --git a/APPL/API2/model_cnt_termijn.inc b/APPL/API2/model_cnt_termijn.inc
index 53b23475c0..170d03dbcc 100644
--- a/APPL/API2/model_cnt_termijn.inc
+++ b/APPL/API2/model_cnt_termijn.inc
@@ -43,6 +43,7 @@ function model_cnt_termijn()
             "dbs": "cnt_termijn_type",
             "label": L("cnt_termijn_type"),
             "typ": "varchar",
+            "required": true,
             "LOV": L("cnt_termijn_typeLOV")
         },
         "number": {
diff --git a/APPL/API2/model_fac_groeprechten.inc b/APPL/API2/model_fac_groeprechten.inc
index afb752fa17..b699b8a20e 100644
--- a/APPL/API2/model_fac_groeprechten.inc
+++ b/APPL/API2/model_fac_groeprechten.inc
@@ -77,7 +77,7 @@ function model_fac_groeprechten (params)
       },
       "ins_discipline": {
         "dbs": "ins_discipline_key",
-        "label": L("ins_discipline_key"),
+        "label": L("mgt_discipline"),
         "typ": "key",
         "hidden_fld": true,
         "foreign": {
@@ -232,7 +232,7 @@ function model_fac_groeprechten (params)
         this.fields["ins_discipline"] =
           {
             "dbs": "nn_disc",
-            "label": L("ins_discipline_key"),
+            "label": L("mgt_discipline"),
             "typ": "varchar",
             val: fnFunctieDisc,
             "hidden_fld": true
@@ -269,7 +269,7 @@ function model_fac_groeprechten (params)
         this.fields["ins_discipline"] =
           {
             "dbs": "nn_disc",
-            "label": L("ins_discipline_key"),
+            "label": L("mgt_discipline"),
             "typ": "varchar",
             "hidden_fld": true
             };
diff --git a/APPL/API2/model_fac_profielwaarde.inc b/APPL/API2/model_fac_profielwaarde.inc
index d9f3516f2f..db20f2f2e9 100644
--- a/APPL/API2/model_fac_profielwaarde.inc
+++ b/APPL/API2/model_fac_profielwaarde.inc
@@ -26,13 +26,13 @@ function model_fac_profielwaarde()
     var catalogus_sql = "SELECT B.ins_discipline_key"
                       + "     , B.ins_discipline_omschrijving  as omschrijving"
                       + "     , ''                             as prefix"
-                      + "     , B.ins_discipline_omschrijving"
+                      + "     , " + safe.qL("lcl_bes_Catalogus") + "||': '||  B.ins_discipline_omschrijving  as omschrijving_ext"
                       + "  FROM bes_v_aanwezigdiscipline B"
                       + " UNION ALL "
                       + "SELECT M.ins_discipline_key"
                       + "     , M.ins_discipline_omschrijving"
                       + "     , S.ins_srtdiscipline_prefix"
-                      + "     , S.ins_srtdiscipline_prefix ||'-'|| M.ins_discipline_omschrijving"
+                      + "     , " + safe.qL("lcl_mld_vakgroep") + "||': '|| S.ins_srtdiscipline_prefix ||'-'|| M.ins_discipline_omschrijving"
                       + "  FROM mld_v_aanwezigdiscipline M"
                       + "     , ins_srtdiscipline        S"
                       + " WHERE M.ins_srtdiscipline_key = S.ins_srtdiscipline_key";
@@ -46,10 +46,11 @@ function model_fac_profielwaarde()
             "filter": "exact",
             "seq": "fac_s_fac_profielwaarde_key"
         },
-        "profile_key": {
+        "profile": {
             "dbs": "fac_profiel_key",
-            "label": L("fac_profiel_key"),
+            "label": L("fac_profiel"),
             "typ": "key",
+            "required": true,
             "foreign": {
                 "tbl": "fac_profiel",
                 "key": "fac_profiel_key",
@@ -62,14 +63,15 @@ function model_fac_profielwaarde()
             "typ": "varchar",
             "readonly": true
         },
-        "catalog_key": {
+        "catalog": {
             "dbs": "ins_discipline_key",
-            "label": L("ins_discipline_key"),
+            "label": L("mgt_discipline"),
             "typ": "key",
+            "required": true,
             "foreign": {
                 "tbl": "("+ catalogus_sql + ")",
                 "key": "ins_discipline_key",
-                "desc": "omschrijving"
+                "desc": "omschrijving_ext"
             }
         },
         "value_limit": {
diff --git a/APPL/API2/model_ins_tab_discipline.inc b/APPL/API2/model_ins_tab_discipline.inc
index 1ffef4ba1f..3dec7b3a4b 100644
--- a/APPL/API2/model_ins_tab_discipline.inc
+++ b/APPL/API2/model_ins_tab_discipline.inc
@@ -123,7 +123,7 @@ function model_ins_tab_discipline(disc_key, params)
     }
 
     this.autfunction = "WEB_FACMSU";
-    this.record_title = L("ins_discipline_key"); // TODO: De generieke termen
+    this.record_title = L("mgt_discipline"); // TODO: De generieke termen
     this.records_title = L("res_v_res_catalogus_m");
 
     var xparams = null;
diff --git a/APPL/API2/model_mld_typeopdr_srtdiscipline.inc b/APPL/API2/model_mld_typeopdr_srtdiscipline.inc
index 828ebf11bd..ebd82c41e1 100644
--- a/APPL/API2/model_mld_typeopdr_srtdiscipline.inc
+++ b/APPL/API2/model_mld_typeopdr_srtdiscipline.inc
@@ -55,7 +55,7 @@ function model_mld_typeopdr_srtdiscipline()
         },
         "typeopdr_c": {
             "dbs": "ins_discipline_key",
-            "label": L("ins_discipline_key"),
+            "label": L("mgt_discipline"),
             "typ": "key",
             "foreign": {
                 "tbl": "mld_discipline",
diff --git a/APPL/API2/model_prs_kostensoort.inc b/APPL/API2/model_prs_kostensoort.inc
index 842a41eb16..b18dd7e08e 100644
--- a/APPL/API2/model_prs_kostensoort.inc
+++ b/APPL/API2/model_prs_kostensoort.inc
@@ -66,7 +66,8 @@ function model_prs_kostensoort()
                 "key": "PRS_KOSTENSOORTGRP_KEY",
                 "desc": "PRS_KOSTENSOORTGRP_OMS"
             },
-            "LOVinit": ""
+            "LOVinit": "",
+            "filter": "exact"
         },
         "charge": {
             "dbs": "prs_kostensoort_doorbelasten",
diff --git a/APPL/MGT/fac_edit_groeprechten.asp b/APPL/MGT/fac_edit_groeprechten.asp
index 1f93e4dee8..b6593f62bb 100644
--- a/APPL/MGT/fac_edit_groeprechten.asp
+++ b/APPL/MGT/fac_edit_groeprechten.asp
@@ -194,9 +194,9 @@ function radioTD(name, LOV, val)
         if (fdisc)
         {
             if (disc_arr_key.length == 1)
-                ROFIELDTR("fldtxt", L("ins_discipline_key"), Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_arr_key[0]));
+                ROFIELDTR("fldtxt", L("mgt_discipline"), Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_arr_key[0]));
             else
-                ROFIELDTR("fldtxt", L("ins_discipline_key"), "(" + disc_arr_key.length + ")");
+                ROFIELDTR("fldtxt", L("mgt_discipline"), "(" + disc_arr_key.length + ")");
         }
         var prsLOV = api2.splitLOV(buildPrsLevelLOV());
         var algLOV = api2.splitLOV(buildAlgLevelLOV());
diff --git a/APPL/MGT/fac_functie.asp b/APPL/MGT/fac_functie.asp
index e0613bc0b7..0f968e6306 100644
--- a/APPL/MGT/fac_functie.asp
+++ b/APPL/MGT/fac_functie.asp
@@ -104,7 +104,7 @@
     }
     if (disc_key > 0)
     {
-        scf_params.search.labels.push({ "lbl": L("ins_discipline_key"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
+        scf_params.search.labels.push({ "lbl": L("mgt_discipline"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
         scf_params.list.columns.pop(); // Discipline kolom mag er nu wel tussenuit
         scf_params.list.columns.push(
                     "authorization.fac_groep",
diff --git a/APPL/MGT/fac_groep.asp b/APPL/MGT/fac_groep.asp
index 10261cfede..cd78386a26 100644
--- a/APPL/MGT/fac_groep.asp
+++ b/APPL/MGT/fac_groep.asp
@@ -104,7 +104,7 @@
     }
     if (disc_key > 0)
     {
-        scf_params.search.labels.push({ "lbl": L("ins_discipline_key"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
+        scf_params.search.labels.push({ "lbl": L("mgt_discipline"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
     }
 
     scaffolding(model, scf_params);
diff --git a/APPL/MGT/fac_profielwaarde.asp b/APPL/MGT/fac_profielwaarde.asp
index f329232927..07843d3cf0 100644
--- a/APPL/MGT/fac_profielwaarde.asp
+++ b/APPL/MGT/fac_profielwaarde.asp
@@ -22,15 +22,15 @@ scaffolding(this_model,
         "search": {
             "autosearch": true,
             "filters": [
-                "profile_key"
+                "profile"
             ]
         },
         "list": {
             "columns": [
                 "id",
-                "profile_key",
+                "profile",
                 "prefix",
-                "catalog_key",
+                "catalog",
                 "value_limit"
             ]
         }
diff --git a/APPL/MGT/prs_kostensoort.asp b/APPL/MGT/prs_kostensoort.asp
index 5f547f1ac8..1085e53f03 100644
--- a/APPL/MGT/prs_kostensoort.asp
+++ b/APPL/MGT/prs_kostensoort.asp
@@ -22,7 +22,9 @@ scaffolding(this_model,
         "search": {
             "autosearch": true,
             "filters": [
-                "description"
+                "description",
+                "name",
+                "group"
             ]
         },
         "list": {