diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json
index 1e5c861e25..959b267d73 100644
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@@ -338,6 +338,7 @@
   "tagRenderings": [
     "shops.*"
   ],
+  "#filter": "no-auto",
   "filter": [
     {
       "id": "sells_second-hand",
@@ -384,7 +385,8 @@
           }
         }
       ]
-    }
+    },
+    "open_now"
   ],
   "deletion": true,
   "allowMove": true
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index deef4447e5..2bbd102eef 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -26,10 +26,19 @@
   },
   "searchTerms": {
     "en": [
-      "drink","water","fountain","bubbler"
+      "drink",
+      "water",
+      "fountain",
+      "bubbler"
     ],
     "nl": [
-      "drinken","water","drinkwater","waterfontein","fontein","kraan","kraantje"
+      "drinken",
+      "water",
+      "drinkwater",
+      "waterfontein",
+      "fontein",
+      "kraan",
+      "kraantje"
     ]
   },
   "source": {
diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 5c2264518c..4ec9de90a4 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -33,6 +33,7 @@
       "id": "accepts_cash",
       "options": [
         {
+          "emoji": "🪙",
           "osmTags": "payment:cash=yes",
           "question": {
             "en": "Accepts cash",
@@ -51,6 +52,7 @@
       "id": "accepts_cards",
       "options": [
         {
+          "emoji": "💳",
           "osmTags": "payment:cards=yes",
           "question": {
             "en": "Accepts payment cards",
@@ -69,6 +71,7 @@
       "id": "accepts_debit_cards",
       "options": [
         {
+          "emoji": "💳",
           "osmTags": "payment:debit_cards=yes",
           "question": {
             "en": "Accepts debit cards",
@@ -84,6 +87,7 @@
       "id": "accepts_credit_cards",
       "options": [
         {
+          "emoji": "💳",
           "osmTags": "payment:credit_cards=yes",
           "question": {
             "en": "Accepts credit cards",
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 812a4282cf..f8368c1bc5 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -40,7 +40,7 @@
       ]
     }
   },
-  "minzoom": 10,
+  "minzoom": 12,
   "title": {
     "render": {
       "en": "Shop",