diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 67556c5e1..f58d3333b 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -571,6 +571,28 @@
           }
         }
       ]
+    },
+    {
+      "id": "shelter",
+      "options": [
+        {
+          "osmTags": {
+            "or": [
+              "shelter=yes",
+              "shelter=separate"
+            ]
+          },
+          "question": {
+            "en": "With a shelter",
+            "ca": "Amb refugi",
+            "cs": "S přístřeškem",
+            "de": "Mit Unterstand",
+            "es": "Con refugio",
+            "fr": "Avec un abri",
+            "it": "Con una pensilina"
+          }
+        }
+      ]
     }
   ],
   "allowMove": false
diff --git a/assets/layers/picnic_site/picnic_site.json b/assets/layers/picnic_site/picnic_site.json
index d29d94bb4..ef02be70b 100644
--- a/assets/layers/picnic_site/picnic_site.json
+++ b/assets/layers/picnic_site/picnic_site.json
@@ -245,23 +245,7 @@
     }
   ],
   "filter": [
-    {
-      "id": "shelter",
-      "options": [
-        {
-          "question": {
-            "en": "With a shelter",
-            "nl": "Met een schuilplaats"
-          },
-          "osmTags": {
-            "or": [
-              "shelter=yes",
-              "shelter=separate"
-            ]
-          }
-        }
-      ]
-    },
+    "shelter",
     {
       "id": "fireplace",
       "options": [
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 6b56671d2..368eb1cff 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -3116,7 +3116,8 @@
           "if": "nobrand=yes",
           "addExtraTags": [
             "brand=",
-            "brand:wikidata="
+            "brand:wikidata=",
+            "brand:wikipedia="
           ],
           "then": {
             "en": "Not part of a bigger brand",
@@ -3652,4 +3653,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index 096ce247e..822d21745 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -544,28 +544,7 @@
     }
   ],
   "filter": [
-    {
-      "id": "shelter",
-      "options": [
-        {
-          "osmTags": {
-            "or": [
-              "shelter=yes",
-              "shelter=separate"
-            ]
-          },
-          "question": {
-            "en": "With a shelter",
-            "ca": "Amb refugi",
-            "cs": "S přístřeškem",
-            "de": "Mit Unterstand",
-            "es": "Con refugio",
-            "fr": "Avec un abri",
-            "it": "Con una pensilina"
-          }
-        }
-      ]
-    },
+    "shelter",
     {
       "id": "bench",
       "options": [
@@ -613,4 +592,4 @@
     "tactile_paving"
   ],
   "allowMove": false
-}
+}
\ No newline at end of file