diff --git a/assets/layers/grab_rail/grab_rail.json b/assets/layers/grab_rail/grab_rail.json
index 40ef022e0d..975809629c 100644
--- a/assets/layers/grab_rail/grab_rail.json
+++ b/assets/layers/grab_rail/grab_rail.json
@@ -166,7 +166,7 @@
           },
           "mappings": [
             {
-              "if": "is_foldable:LOCATION=yes",
+              "if": "grab_rail:foldable:LOCATION=yes",
               "then": {
                 "en": "The {{TRANSL}} grab rail is <b>foldable</b>",
                 "nl": "De grijpbeugel aan de {{TRANSL}}kant is <b>opklapbaar</b>",
@@ -175,7 +175,7 @@
               }
             },
             {
-              "if": "is_foldable:LOCATION=no",
+              "if": "grab_rail:foldable:LOCATION=no",
               "then": {
                 "en": "The {{TRANSL}} grab rail is not foldable",
                 "nl": "De grijpbeugel aan de {{TRANSL}}kant is niet opklapbaar",
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 16dc5897ba..3943d87674 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -1449,7 +1449,8 @@
         "wheelchair",
         "relevant-questions",
         "prefixed",
-        "amenity-prefixed"
+        "amenity-prefixed",
+        "hidden"
       ],
       "question": {
         "en": "Is the wheelchair-accessible toilet locked?",
@@ -1565,7 +1566,8 @@
           "wheelchair",
           "relevant-questions",
           "prefixed",
-          "amenity-prefixed"
+          "amenity-prefixed",
+          "hidden"
         ],
         "questionHint": {
           "en": "Left and right are interpreted as when <b>sitting</b> on the toilet",
@@ -1600,7 +1602,8 @@
           "wheelchair",
           "relevant-questions",
           "prefixed",
-          "amenity-prefixed"
+          "amenity-prefixed",
+          "hidden"
         ],
         "condition": {
           "and+": [
@@ -1629,7 +1632,8 @@
           "wheelchair",
           "relevant-questions",
           "prefixed",
-          "amenity-prefixed"
+          "amenity-prefixed",
+          "hidden"
         ],
         "condition": {
           "and+": [
@@ -1749,7 +1753,6 @@
     },
     {
       "id": "adult-changing-table",
-      "labels": [
         "prefixed",
         "hidden",
         "relevant-questions",