diff --git a/APPL/INS/ins_edit_deel.asp b/APPL/INS/ins_edit_deel.asp
index d41663a606..f6b7359ecc 100644
--- a/APPL/INS/ins_edit_deel.asp
+++ b/APPL/INS/ins_edit_deel.asp
@@ -583,6 +583,21 @@ var ins_deel_aantal = 1;
           FcltMgr.alert(msg);
           return false;
         }
+
+        function cadShowdiscfn()
+        { <%
+          if (disc_key != -1)
+          { %>
+            return <%=disc_key%>;
+       <% }
+          else
+          { %>
+            if ($("input#disc") && $("input#disc").val())
+              return $("input#disc").val();
+            return -1;
+       <% } %>
+        };
+
       </script>
 
       <form name="u2"
@@ -846,6 +861,8 @@ var ins_deel_aantal = 1;
                                                              terrein: true,
                                                              filtercode: "INCVR",
                                                              onLocChange: change,
+                                                             cadSelect: true,
+                                                             cadShowdiscfn: "cadShowdiscfn",
                                                              escalateOnChUp: true, // ook onLocChange als je gebouw wijzigt
                                                              readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !this_ins.canChangeOwn)
                                                            });
diff --git a/APPL/INS/ins_search.asp b/APPL/INS/ins_search.asp
index 33b783fc73..680b79a38d 100644
--- a/APPL/INS/ins_search.asp
+++ b/APPL/INS/ins_search.asp
@@ -133,6 +133,13 @@ var authparams = user.checkAutorisation(autfunction);
       //        doSubmit();
       //}
 
+      function cadShowdiscfn()
+      {
+          if ($("input#disc") && $("input#disc").val())
+            return $("input#disc").val();
+          return -1;
+      };
+
 <%    if (backo)
       { %>
         function myModal()
@@ -425,37 +432,31 @@ var authparams = user.checkAutorisation(autfunction);
                                                                   ruimtekey: room_key,
                                                                   werkplekkey: wpl_key, // indien eindlevel 5 is, dan wordt deze parameter niet gebruikt
                                                                   terrein: true,
-                                                                  onRegChange: alg_startlevel==0? "UnSelectOwner()" : false,
-                                                                  onDisChange: alg_startlevel==1? "UnSelectOwner()" : false,
-                                                                  onLocChange: alg_startlevel==2? "UnSelectOwner()" : false,
-                                                                  onGebChange: alg_startlevel==3? "UnSelectOwner()" : false,
-                                                                  onVerChange: alg_startlevel==4? "UnSelectOwner()" : false,
-                                                                  onRuiChange: alg_startlevel==5? "UnSelectOwner()" : false,
+                                                                  onRegChange: alg_startlevel==0? "UnSelectOwner()" : null,
+                                                                  onDisChange: alg_startlevel==1? "UnSelectOwner()" : null,
+                                                                  onLocChange: alg_startlevel==2? "UnSelectOwner()" : null,
+                                                                  onGebChange: alg_startlevel==3? "UnSelectOwner()" : null,
+                                                                  onVerChange: alg_startlevel==4? "UnSelectOwner()" : null,
+                                                                  onRuiChange: alg_startlevel==5? "UnSelectOwner()" : null,
                                                                   escalateOnChUp: true, // ook onLocChange als je gebouw wijzigt
                                                                   startlevel: alg_startlevel,
                                                                   eindlevel: alg_endlevel, // ruimte/werkplek
                                                                   filtercode: "INCVR",
                                                                   trclass: "noxd",
+                                                                  cadSelect: true,
+                                                                  cadShowdiscfn: "cadShowdiscfn",
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
                   }
-                  else if (frontend)
+                  else
                   {
                     FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: loc_key,
                                                                   startlevel: alg_startlevel,
-                                                                  eindlevel: 2, // locatie
-                                                                  trclass: "noxd",
-                                                                  whenEmpty: L("lcl_search_generic"),  // want filter
-                                                                  filtercode: "EXP"
-                                                                });
-                  }
-                  else //fronto
-                  {
-                    FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: loc_key,
-                                                                  startlevel: alg_startlevel,
-                                                                  eindlevel: 3, // gebouw
+                                                                  eindlevel: (frontend ? 2 : 3), // frontend: locatie(2), fronto: gebouw(3)
                                                                   trclass: "noxd",
                                                                   whenEmpty: L("lcl_search_generic"),  // want filter
+                                                                  cadSelect: true,
+                                                                  cadShowdiscfn: "cadShowdiscfn",
                                                                   filtercode: "EXP"
                                                                 });
                   }