diff --git a/APPL/FAC/fac_edit_adres.asp b/APPL/FAC/fac_edit_adres.asp
index 43e0e7cf74..85d8f9e056 100644
--- a/APPL/FAC/fac_edit_adres.asp
+++ b/APPL/FAC/fac_edit_adres.asp
@@ -120,7 +120,8 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
                         startlevel: 2,
                         eindlevel: 2,
                         readonly: false,
-                        whenEmpty: L("lcl_search_generic")
+                        whenEmpty: L("lcl_search_generic"),
+                        filtercode: "FAC"
                       });
 
   RWFIELDTR("mld_adr_nm",           "fld",          L("lcl_prs_address_naam"),   mld_adr_nm, {maxlength: 60, required: true});
diff --git a/APPL/Shared/Suggest/SuggestLocatie.asp b/APPL/Shared/Suggest/SuggestLocatie.asp
index 88bac67f4d..2d0e9daff7 100644
--- a/APPL/Shared/Suggest/SuggestLocatie.asp
+++ b/APPL/Shared/Suggest/SuggestLocatie.asp
@@ -88,7 +88,7 @@ if (autlevel > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
       + filtClause.from
       + " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
       + "       OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_wild(chars + "%") + ")"
-      + existBuilding
+      //+ existBuilding
       + filtClause.where
       + " ORDER BY 2"
   WriteResult(sql, bAll, "naam", "alg_locatie_key", "code", "postcode", "extra");