diff --git a/APPL/PRS/prs_contactpersoon_list.inc b/APPL/PRS/prs_contactpersoon_list.inc
index 64fd278317..98118ebc5a 100644
--- a/APPL/PRS/prs_contactpersoon_list.inc
+++ b/APPL/PRS/prs_contactpersoon_list.inc
@@ -29,8 +29,8 @@ function contactpersoon_list (params)
   // params.search        : boolean (true | false)
   // params.bedrijf_key   : key
   // params.contact_name  : wildcard string
-  // params.locatiekey    : key
-  // params.gebouwkey     : key
+  // params.loc_key       : key
+  // params.bld_key       : key
 
   if (intern)
   {
@@ -54,12 +54,12 @@ function contactpersoon_list (params)
   var search = params.search;
   var bedrijf_key = params.bedrijf_key;
   var contact_name = params.contact_name;
-  var locatiekey = params.locatiekey;
-  var gebouwkey = params.gebouwkey;
+  var loc_key = params.loc_key;
+  var bld_key = params.bld_key;
 %>
   <html>
     <head>
-<%    FCLTHeader.Generate(); %>
+<%    FCLTHeader.Generate({ outputmode: outputmode }); %>
       <script type="text/javascript">
         var autosearch = 1; // automatisch laden van resultaat op search pagina
         function refreshall(data)
@@ -109,11 +109,11 @@ function contactpersoon_list (params)
               + "     , prs_contactpersoon cp"
               + "     , prs_contactpersoon_locatie n"
               + "     , prs_bedrijf b"
-              + (gebouwkey > 0
+              + (bld_key > 0
                 ? "   , alg_gebouw g"
                 : "")
               + " WHERE n.alg_locatie_key = l.alg_locatie_key(+)"
-              + (gebouwkey > 0
+              + (bld_key > 0
                 ? " AND l.alg_locatie_key = g.alg_locatie_key(+)"
                 : "")
               + "   AND b.prs_bedrijf_key = cp.prs_bedrijf_key"
@@ -135,11 +135,11 @@ function contactpersoon_list (params)
       if (contact_name)
         sql += " AND UPPER("+ S("prs_contactpers_string") +") LIKE " + safe.quoted_sql_wild("%" + contact_name + "%");
 
-      if (locatiekey > 0)
-        sql += "    AND l.alg_locatie_key = " + locatiekey;
+      if (loc_key > 0)
+        sql += "    AND l.alg_locatie_key = " + loc_key;
 
-      if (gebouwkey > 0)
-        sql += "    AND g.alg_gebouw_key = " + gebouwkey;
+      if (bld_key > 0)
+        sql += "    AND g.alg_gebouw_key = " + bld_key;
 
       var ALGreadlevel = (authparams? authparams.ALGreadlevel : 9);
       if (ALGreadlevel > -1)
@@ -173,7 +173,10 @@ function contactpersoon_list (params)
                                      ID: "contacttable",
                                      buttons: buttons,
                                      showAll: showall,
-                                     title: L("lcl_prs_companies_contact_title")
+                                     title: L("lcl_prs_companies_contact_title"),
+                                     flexModule: "PRS",
+                                     flexId: "prs_contactpersoon_key",
+                                     filterParams: params
                                    });
 
       if (search || bedrijf_key == -1)
diff --git a/APPL/PRS/prs_contactpersoon_search.asp b/APPL/PRS/prs_contactpersoon_search.asp
index 0c2c700fe6..376e00df41 100644
--- a/APPL/PRS/prs_contactpersoon_search.asp
+++ b/APPL/PRS/prs_contactpersoon_search.asp
@@ -72,7 +72,7 @@ var ALGreadlevel = (authparams? authparams.ALGreadlevel : 9);
 <%            FCLTbedrijfselector("bedrijf_key", // company
                                   "sgComp",
                                   { companyKey: comp_key,
-                                    label: L("lcl_bes_company"),
+                                    label: L("lcl_prs_company"),
                                     autlevel: ALGreadlevel, // Was voorheen niet aanwezig
                                     whenEmpty: L("lcl_search_generic")  // want filter
                                   }); %>
diff --git a/APPL/PRS/prs_contactpersoon_search_list.asp b/APPL/PRS/prs_contactpersoon_search_list.asp
index 879d5927ca..0512b692cc 100644
--- a/APPL/PRS/prs_contactpersoon_search_list.asp
+++ b/APPL/PRS/prs_contactpersoon_search_list.asp
@@ -27,8 +27,8 @@ var gebouwkey = getQParamInt("gebouwkey", -1);
 contactpersoon_list ({ outputmode: outputmode,
                        bedrijf_key: (bedrijf_key != -1? bedrijf_key : null),
                        contact_name: (contact_name != ""? contact_name : null),
-                       locatiekey: (locatiekey != -1? locatiekey : null),
-                       gebouwkey: (gebouwkey != -1? gebouwkey : null),
+                       loc_key: (locatiekey != -1? locatiekey : null),
+                       bld_key: (gebouwkey != -1? gebouwkey : null),
                        intern: intern,
                        search: search,
                        showall: showall
diff --git a/APPL/Shared/resultset_filter_table.inc b/APPL/Shared/resultset_filter_table.inc
index 8869e56f48..209580d849 100644
--- a/APPL/Shared/resultset_filter_table.inc
+++ b/APPL/Shared/resultset_filter_table.inc
@@ -1740,6 +1740,7 @@ function getRSFilterColumns(lparams)
         case "org_key":         { lfilterValue = getRSFilterValueByKey("PRS_AFDELING", lparams[lparam], L("lcl_prs_organisatie"));
                                   break;
                                 }
+        case "bedrijf_key":
         case "company_key":     { lfilterValue = getRSFilterValueByKey("PRS_BEDRIJF", lparams[lparam], L("lcl_prs_company"));
                                   break;
                                 }
