diff --git a/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson.ts b/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson.ts
index 963f67e0ad..df83ea3f4c 100644
--- a/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson.ts
+++ b/Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson.ts
@@ -102,7 +102,17 @@ export interface MappingConfigJson {
 
     /**
      * If chosen as answer, these tags will be applied as well onto the object.
-     * Not compatible with multiAnswer
+     * Not compatible with multiAnswer.
+     * 
+     * This can be used e.g. to erase other keys which indicate the 'not' value:
+     *```json
+     * {
+     *     "if": "crossing:marking=rainbow",
+     *     "then": "This is a rainbow crossing",
+     *     "addExtraTags": "not:crossing:marking="
+     * }
+     * ```
+     * 
      */
     addExtraTags?: string[]
 
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index d698f8fb1b..f56cb68497 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -154,6 +154,7 @@
     },
     {
       "id": "toilets-fee",
+      "condition": "access!=no",
       "question": {
         "en": "Are these toilets free to use?",
         "de": "Können diese Toiletten kostenlos benutzt werden?",
@@ -220,6 +221,7 @@
     },
     {
       "id": "Opening-hours",
+      "condition": "access!=no",
       "question": {
         "en": "When are these toilets opened?",
         "nl": "Wanneer zijn deze toiletten open?",
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 3cfcf8ae91..e33141ff56 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -20,6 +20,14 @@
   "widenFactor": 2,
   "hideFromOverview": false,
   "layers": [
+      {
+      "builtin": "indoors",
+      "override": {
+        "minzoom": 19,
+        "name": null,
+        "passAllFeatures": true
+      }
+    },
     {
       "builtin": "bike_repair_station",
       "override": {
@@ -380,12 +388,6 @@
         ]
       }
     },
-    {
-      "builtin": "indoors",
-      "override": {
-        "minzoom": 19
-      }
-    },
     {
       "builtin": "current_view",
       "override": {