diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json
index 3cb62040e..ce51b00ed 100644
--- a/assets/layers/waste_basket/waste_basket.json
+++ b/assets/layers/waste_basket/waste_basket.json
@@ -386,7 +386,7 @@
             "fr": "Poubelle pour déjections canines",
             "cs": "Odpadkový koš na psí exkrementy"
           },
-          "osmTags": "waste~i~.*dog_excrement.*"
+          "osmTags": "waste~i~.*excrement.*"
         },
         {
           "question": {
@@ -467,7 +467,7 @@
             "ru": "Корзина для мусора с дозатором для пакетов (собачьих) экскрементов",
             "uk": "Кошик для сміття з дозатором для пакетиків з (собачими) екскрементами"
           },
-          "osmTags": "vending=dog_excrement_bag"
+          "osmTags": "vending=excrement_bags"
         }
       ]
     }
diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json
index 74c1a1720..33df52790 100644
--- a/assets/themes/pets/pets.json
+++ b/assets/themes/pets/pets.json
@@ -117,6 +117,7 @@
           "it": "Negozi che accettano i cani",
           "ko": "반려견 친화적 상점"
         },
+
         "pointRendering": [
           {
             "iconBadges+": [
@@ -142,10 +143,10 @@
     {
       "builtin": "shops",
       "override": {
-        "minzoom": 18,
         "filter": {
           "sameAs": "shop_dog_friendly"
         },
+        "minzoom": 18,
         "name": null
       }
     },
@@ -153,10 +154,13 @@
       "builtin": "waste_basket",
       "override": {
         "id": "waste_basket_dogs",
-        "name": {
-          "en": "Waste baskets with excrement bag dispensers"
+        "name=": {
+          "en": "Waste baskets with excrement bag dispensers",
+          "nl": "Vuilnisbakken met verdelers voor hondenpoepzakjes"
         },
         "presets=": [],
+        "filter=": [],
+        "minzoom": 14,
         "source": {
           "osmTags": {
             "and+": [