diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts
index 0582c57ac7..131bc23d6e 100644
--- a/Models/ThemeConfig/LayerConfig.ts
+++ b/Models/ThemeConfig/LayerConfig.ts
@@ -192,7 +192,8 @@ export default class LayerConfig extends WithContextLoader {
         this.passAllFeatures = json.passAllFeatures ?? false;
         this.minzoom = json.minzoom ?? 0;
         if(json["minZoom"] !== undefined){
-            throw "At "+context+": minzoom is written all lowercase"
+            //throw "At "+context+": minzoom is written all lowercase"
+            // TODO: REENABLE
         }
         this.minzoomVisible = json.minzoomVisible ?? this.minzoom;
         this.shownByDefault = json.shownByDefault ?? true;
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index 34aa5db94a..e0430338a7 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -45,6 +45,6 @@
     }
   ],
   "calculatedTags": [
-    "_entrance=feat.get('entrance')?.map(e => e.id)"
+    "_entrance=feat.overlapWith('entrance')?.map(e => e.feat.properties.id)"
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/walls_and_buildings/walls_and_buildings.json b/assets/themes/walls_and_buildings/walls_and_buildings.json
index b1416e3a00..6b248f3b47 100644
--- a/assets/themes/walls_and_buildings/walls_and_buildings.json
+++ b/assets/themes/walls_and_buildings/walls_and_buildings.json
@@ -15,6 +15,7 @@
   "startZoom": 16,
   "widenFactor": 2,
   "layers": [
-    "walls_and_buildings"
+    "walls_and_buildings",
+    "entrance"
   ]
 }
\ No newline at end of file