diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index 1d35dbb3c..ced6f1579 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -27,11 +27,7 @@
     "cs": "Jedná se o veřejný odpadkový koš, odpadkový koš, kam můžete vyhodit odpadky."
   },
   "source": {
-    "osmTags": {
-      "and": [
-        "amenity=waste_basket"
-      ]
-    }
+    "osmTags": "amenity=waste_basket"
   },
   "minzoom": 17,
   "title": {
@@ -489,4 +485,4 @@
     "enableRelocation": false,
     "enableImproveAccuracy": true
   }
-}
+}
\ No newline at end of file
diff --git a/assets/layers/waste_disposal/waste_disposal.json b/assets/layers/waste_disposal/waste_disposal.json
index da2a0c29c..7710aa5c1 100644
--- a/assets/layers/waste_disposal/waste_disposal.json
+++ b/assets/layers/waste_disposal/waste_disposal.json
@@ -27,7 +27,6 @@
     "osmTags": "amenity=waste_disposal"
   },
   "minzoom": 12,
-  "minzoomVisible": 12,
   "title": {
     "render": {
       "en": "Waste Disposal",
@@ -324,4 +323,4 @@
     "enableImproveAccuracy": true,
     "enableRelocation": true
   }
-}
+}
\ No newline at end of file
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 296b7ca2c..1bd9e2a74 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -61,7 +61,6 @@
       "builtin": "shops",
       "override": {
         "minzoom": 18,
-        "minzoomVisible": 18,
         "description": {
           "en": "Add a new post partner to the map in an existing shop",
           "de": "Hinzufügen eines neuen Post-Partners auf der Karte in einem bestehenden Geschäft",
diff --git a/assets/themes/waste/waste.json b/assets/themes/waste/waste.json
index e93cf7f51..0994e3fab 100644
--- a/assets/themes/waste/waste.json
+++ b/assets/themes/waste/waste.json
@@ -40,8 +40,7 @@
     {
       "builtin": "waste_basket",
       "override": {
-        "minzoom": 16,
-        "minzoomVisible": 16
+        "minzoom": 16
       }
     },
     "recycling",