diff --git a/APPL/ALG/alg_gebouw.asp b/APPL/ALG/alg_gebouw.asp
index 66f15b7bc3..7b77820c8d 100644
--- a/APPL/ALG/alg_gebouw.asp
+++ b/APPL/ALG/alg_gebouw.asp
@@ -16,7 +16,7 @@
 FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jquery-ui.js"]})
 
 var bld_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
+var cnt_full = getQParamInt("cnt_full", 1);
 
 if (bld_key > 0)
 {
@@ -95,7 +95,7 @@ else
       if (authparamsCNTMAN || authparamsCNTUSE)
       {
           var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&bld_key=" + bld_key
-          page1 += (cnt_full ? "&cnt_full=1" : "");
+          page1 += "&cnt_full="+cnt_full;
           IFRAMER("cntlistframe", page1, { icon: "fa-list"} );
       }
 
diff --git a/APPL/ALG/alg_gebouw_list.inc b/APPL/ALG/alg_gebouw_list.inc
index 29797dd98b..543606c3be 100644
--- a/APPL/ALG/alg_gebouw_list.inc
+++ b/APPL/ALG/alg_gebouw_list.inc
@@ -60,7 +60,7 @@ function fnrowClass(oRs)
   return lclass;
 }
 
-var all_cnt = getQParamInt("cnt_full", 0);
+var cnt_full = getQParamInt("cnt_full", 1);
 
   // Fast check to see if any building responsibles have been set
   // If not, we can suppress the column
@@ -106,8 +106,8 @@ var all_cnt = getQParamInt("cnt_full", 0);
   function gebouwEdit(row)
   {
     var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var v_all_cnt = <%=all_cnt%>;
-    var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
+    var v_all_cnt = <%=cnt_full%>;
+    var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key + "&cnt_full=<%=cnt_full%>";
     FcltMgr.openDetail(url, L("lcl_building") + " " + algData.oms);
   }
 
diff --git a/APPL/ALG/alg_gebouw_search.asp b/APPL/ALG/alg_gebouw_search.asp
index 2ade505795..a281f65fa7 100644
--- a/APPL/ALG/alg_gebouw_search.asp
+++ b/APPL/ALG/alg_gebouw_search.asp
@@ -21,7 +21,7 @@ var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
 var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
+var cnt_full = getQParamInt("cnt_full", 1);
 var authparams = alg.checkAutorisation();
 var this_alg = alg.func_enabled(gebouw_key);
 %>
@@ -58,12 +58,9 @@ var this_alg = alg.func_enabled(gebouw_key);
     <form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
       <% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
       SEARCH_BLOCK_START();
-      if (cnt_full) {
-            %>
-          <input type="hidden" id="cnt_full" name="cnt_full" value="1">
-            <%
-          }
-          <!-- Locatie, gebouw en verdieping -->
+%>
+          <input type="hidden" id="cnt_full" name="cnt_full" value="<%=cnt_full%>">
+<%
                   FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                 locatiekey: locatie_key,
                                                                 gebouwkey: gebouw_key,
diff --git a/APPL/ALG/alg_gebouw_search_list.asp b/APPL/ALG/alg_gebouw_search_list.asp
index 67b4f8e97f..b48d9dd22b 100644
--- a/APPL/ALG/alg_gebouw_search_list.asp
+++ b/APPL/ALG/alg_gebouw_search_list.asp
@@ -32,7 +32,7 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
 var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
+var cnt_full = getQParamInt("cnt_full", 1);
 var fitness_score1_from = getQParamFloat("fitness_score1_from", -1);       // Conditie score van.
 var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.
 var bld_email = getQParam("bld_email", ""); // Gebouw email.
diff --git a/APPL/ALG/alg_locatie.asp b/APPL/ALG/alg_locatie.asp
index 38a4c420b0..3fecd2f54c 100644
--- a/APPL/ALG/alg_locatie.asp
+++ b/APPL/ALG/alg_locatie.asp
@@ -21,7 +21,7 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery"],
                       js: ["jquery-ui.js"]})
 
 var loc_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
+var cnt_full = getQParamInt("cnt_full", 1);
 
 if (loc_key > 0)
 {
@@ -99,7 +99,7 @@ else
       if (authparamsCNTMAN || authparamsCNTUSE)
       {
           var page2="../cnt/cnt_search_list.asp?embedded=1&tiny=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
-          page2 += (cnt_full ? "&cnt_full=1" : "");
+          page2 += "&cnt_full="+cnt_full;
           IFRAMER("cntlistframe", page2, { icon: "fa-list" } );
       }
 
diff --git a/APPL/ALG/alg_locatie_list.inc b/APPL/ALG/alg_locatie_list.inc
index e4886e1b78..98c70871c2 100644
--- a/APPL/ALG/alg_locatie_list.inc
+++ b/APPL/ALG/alg_locatie_list.inc
@@ -62,7 +62,7 @@ function fnrowClass(oRs)
   return lclass;
 }
 
-var all_cnt = getQParamInt("cnt_full", 0);
+var cnt_full = getQParamInt("cnt_full", 1);
 %>
 <script type="text/javascript">
   var autosearch = 1; //automatisch laden van resultaat op search pagina
@@ -83,9 +83,9 @@ var all_cnt = getQParamInt("cnt_full", 0);
 
   function locatieEdit(row)
   {
-    var v_all_cnt = <%=all_cnt%>;
+    var v_all_cnt = <%=cnt_full%>;
     var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/ALG/alg_locatie.asp?key="+algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
+    var url = "appl/ALG/alg_locatie.asp?key="+algData.key + "&cnt_full=<%=cnt_full%>";
     FcltMgr.openDetail(url, L("lcl_location") + ' ' + algData.oms);
   }
 
diff --git a/APPL/ALG/alg_locatie_search.asp b/APPL/ALG/alg_locatie_search.asp
index a6de446e5f..d4db069e57 100644
--- a/APPL/ALG/alg_locatie_search.asp
+++ b/APPL/ALG/alg_locatie_search.asp
@@ -16,7 +16,7 @@ var ins_score_enabled = S("ins_score_enabled") == 1;
 var district_key = getQParamInt("district_key", -1); //district
 var locatie_key = getQParamInt("locatie_key", -1); //locatie
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
+var cnt_full = getQParamInt("cnt_full", 1);
 var authparams = alg.checkAutorisation();
 %>
 
@@ -52,13 +52,8 @@ var authparams = alg.checkAutorisation();
       <form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
 <%    SEARCH_PAGE_START({ header: L("lcl_filterblok") });
       SEARCH_BLOCK_START();
-        if (cnt_full) {
-           %>
-            <input type="hidden" id="cnt_full" name="cnt_full" value="1">
-            <%
-          }
-        %>
-              <!-- Locatie, gebouw en verdieping -->
+%>
+              <input type="hidden" id="cnt_full" name="cnt_full" value="<%=cnt_full%>">
 <%                  FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                   districtkey: district_key,
                                                                   locatiekey: locatie_key,
diff --git a/APPL/ALG/alg_locatie_search_list.asp b/APPL/ALG/alg_locatie_search_list.asp
index 25057c9168..98d55c685c 100644
--- a/APPL/ALG/alg_locatie_search_list.asp
+++ b/APPL/ALG/alg_locatie_search_list.asp
@@ -27,7 +27,7 @@ var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var loc_code = getQParam("loc_code", ""); // Locatiecode
 var loc_descr = getQParam("loc_descr", ""); // Locatienaam
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
+var cnt_full = getQParamInt("cnt_full", 1);
 var expalgincl = getQParamInt("expalgincl", 0) == 1;
 var fitness_score1_from = getQParamFloat("fitness_score1_from", -1);       // Conditie score van.
 var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.