diff --git a/APPL/MJB/mjb_search_list.asp b/APPL/MJB/mjb_search_list.asp
index b725988c75..c80f7103d9 100644
--- a/APPL/MJB/mjb_search_list.asp
+++ b/APPL/MJB/mjb_search_list.asp
@@ -319,7 +319,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
          + (loc_key > 0
            ? "         AND el.ins_alg_locatie_key = " + loc_key
            : "")
-         + (bld_key > 0
+         + (bld_key > 0 // elders in dit bestand wordt scherper gefilterd, deze is voor de performance
            ? "         AND el.ins_alg_locatie_key = (SELECT alg_locatie_key FROM alg_gebouw WHERE alg_gebouw_key = " + bld_key + ")"
            : "")
          + (disc_key > 0
@@ -532,6 +532,9 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
     if (deel)
       sql_cost_verval += " AND ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%");
 
+    if (bld_key > 0)
+       sql_cost_verval += " AND g.alg_gebouw_key = " + bld_key;
+
     var sql_cost = "SELECT cv.alg_district_key"
                  + "     , cv.alg_district_omschrijving"
                  + "     , cv.alg_gebouw_omschrijving"