diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index aeced6e97..8da1b40be 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -954,45 +954,35 @@
       "id": "toilet-changing_table:location"
     },
     {
-      "labels": [
-        "relevant-questions"
-      ],
-      "id": "toilet-handwashing",
+      "id": "toilet-supervised",
       "question": {
-        "en": "Do these toilets have a sink to wash your hands?",
-        "nl": "Hebben deze toiletten een lavabo om de handen te wassen?",
-        "de": "Gibt es hier ein Handwaschbecken?",
-        "es": "¿Estos baños tienen un lavabo para lavarse las manos?",
-        "fr": "Ces toilettes ont-ils un lavabo pour se laver les mains ?",
-        "da": "Har disse toiletter en håndvask til at vaske hænder?",
-        "ca": "Aquests lavabos tenen una pica per a rentar-se les mans?",
-        "cs": "Mají tyto toalety umyvadlo na mytí rukou?"
+        "en": "Is this toilets supervised by a person?",
+        "nl": "Is er toezicht op deze toilet?"
+      },
+      "questionHint": {
+        "en": "This is typically a person tasked with keeping the toilets clean and collecting the fee",
+        "nl": "Deze persoon houdt typisch de toiletten proper en int het toiletgeld"
       },
       "mappings": [
         {
-          "if": "toilets:handwashing=yes",
+          "if": "supervised=yes",
           "then": {
-            "en": "These toilets have a sink to wash your hands",
-            "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen",
-            "de": "Die Toilette hat ein Handwaschbecken",
-            "es": "Estos baños tienen un lavabo para lavarse las manos",
-            "fr": "Ces toilettes ont un lavabo pour se laver les mains",
-            "da": "Dette toilet har en vask til at vaske dine hænder",
-            "ca": "Aquests lavabos tenen una pica per a rentar-se les mans",
-            "cs": "Tyto toalety mají umyvadlo na mytí rukou"
+            "en": "There is a person supervising these toilets during (most of) the opening hours",
+            "nl": "Er is een persoon die toezicht houdt op deze toiletten"
           }
         },
         {
-          "if": "toilets:handwashing=no",
+          "if": "supervised=interval",
           "then": {
-            "en": "These toilets <b>don't</b> have a sink to wash your hands",
-            "nl": "Deze toiletten hebben <b>geen</b> lavabo waar men de handen kan wassen",
-            "de": "Die Toilette hat <b>kein</b> Handwaschbecken",
-            "es": "Estos baños <b>no</b> tienen un lavabo para lavarse las manos",
-            "fr": "Ces toilettes <b>n'ont pas</b> de lavabo pour se laver les mains",
-            "da": "Disse toiletter <b> har ikke </b> en vask til at vaske dine hænder",
-            "ca": "Aquests lavabos <b>no</b> tenen una pica per a rentar-se les mans",
-            "cs": "Tyto toalety <b>nemají umyvadlo na mytí rukou</b>"
+            "en": "There is a person supervising these toilets, but they are present only during certain times of the opening hours",
+            "nl": "Er is een persoon die toezicht houdt op deze toiletten, maar deze is slechts op enkele vaste momenten aanwezig"
+          }
+        },
+        {
+          "if": "supervised=no",
+          "then": {
+            "en": "These toilets are not supervised",
+            "nl": "Er is geen persoon die toezicht houdt"
           }
         }
       ]
@@ -1047,6 +1037,97 @@
         ]
       }
     },
+    {
+      "labels": [
+        "relevant-questions"
+      ],
+      "id": "toilet-handwashing",
+      "question": {
+        "en": "Do these toilets have a sink to wash your hands?",
+        "nl": "Hebben deze toiletten een lavabo om de handen te wassen?",
+        "de": "Gibt es hier ein Handwaschbecken?",
+        "es": "¿Estos baños tienen un lavabo para lavarse las manos?",
+        "fr": "Ces toilettes ont-ils un lavabo pour se laver les mains ?",
+        "da": "Har disse toiletter en håndvask til at vaske hænder?",
+        "ca": "Aquests lavabos tenen una pica per a rentar-se les mans?",
+        "cs": "Mají tyto toalety umyvadlo na mytí rukou?"
+      },
+      "mappings": [
+        {
+          "if": "toilets:handwashing=yes",
+          "then": {
+            "en": "These toilets have a sink to wash your hands",
+            "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen",
+            "de": "Die Toilette hat ein Handwaschbecken",
+            "es": "Estos baños tienen un lavabo para lavarse las manos",
+            "fr": "Ces toilettes ont un lavabo pour se laver les mains",
+            "da": "Dette toilet har en vask til at vaske dine hænder",
+            "ca": "Aquests lavabos tenen una pica per a rentar-se les mans",
+            "cs": "Tyto toalety mají umyvadlo na mytí rukou"
+          }
+        },
+        {
+          "if": "toilets:handwashing=no",
+          "then": {
+            "en": "These toilets <b>don't</b> have a sink to wash your hands",
+            "nl": "Deze toiletten hebben <b>geen</b> lavabo waar men de handen kan wassen",
+            "de": "Die Toilette hat <b>kein</b> Handwaschbecken",
+            "es": "Estos baños <b>no</b> tienen un lavabo para lavarse las manos",
+            "fr": "Ces toilettes <b>n'ont pas</b> de lavabo pour se laver les mains",
+            "da": "Disse toiletter <b> har ikke </b> en vask til at vaske dine hænder",
+            "ca": "Aquests lavabos <b>no</b> tenen una pica per a rentar-se les mans",
+            "cs": "Tyto toalety <b>nemají umyvadlo na mytí rukou</b>"
+          }
+        }
+      ]
+    },
+
+    {
+      "id": "toilet-drying",
+      "question": {
+        "en": "Do these toilets have a device to dry your hands?",
+        "nl": "Hebben deze toiletten een apparaat om je handen te drogen?"
+      },
+      "multiAnswer": true,
+      "mappings": [
+        {
+          "if": "toilets:hands_drying=electric_hand_dryer",
+          "then": {
+            "en": "Electric hand dryers are available for drying hands.",
+            "nl": "Elektrische handdrogers zijn beschikbaar om handen te drogen."
+          }
+        },
+        {
+          "if": "toilets:hands_drying=paper_towel",
+          "then": {
+            "en": "Paper towels are available for drying hands.",
+            "nl": "Papieren wegwerphanddoeken zijn beschikbaar om handen te drogen."
+          }
+        },
+        {
+          "if": "toilets:hands_drying=towel_cabinet",
+          "then": {
+            "en": "A towel roll cabinet is available for drying hands",
+            "nl": "Een apparaat met een handdoekrol is beschikbaar om handen te drogen"
+          }
+        },
+        {
+          "if": "toilets:hands_drying=towel",
+          "then": {
+            "en": "A fabric towel available to dry your hands.",
+            "nl": "Een stoffen handdoek is beschikbaar om handen te drogen."
+          }
+        },
+        {
+          "if": "toilets:hands_drying=no",
+          "then": {
+            "en": "There are no hand drying facilities available.",
+            "nl": "Er zijn geen handdroogvoorzieningen beschikbaar."
+          }
+        }
+      ],
+      "condition": "toilets:handwashing=yes"
+    },
     "description"
   ],
   "filter": [