diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index 50148fc9c..e044044ff 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -33,17 +33,17 @@
   "minzoom": 14,
   "title": {
     "render": {
-      "en": "Entrance",
-      "nl": "Ingang",
-      "ca": "Entrada",
-      "da": "Indgang",
-      "de": "Eingang",
-      "es": "Entrada",
-      "fr": "Entrée",
-      "pa_PK": "دروازہ",
-      "pl": "Wejście",
-      "cs": "Vchod",
-      "cy": "Mynedfa"
+      "en": "Entrance {ref}",
+      "nl": "Ingang {ref}",
+      "ca": "Entrada {ref}",
+      "da": "Indgang {ref}",
+      "de": "Eingang {ref}",
+      "es": "Entrada {ref}",
+      "fr": "Entrée {ref}",
+      "pa_PK": "دروازہ{ref}",
+      "pl": "Wejście {ref}",
+      "cs": "Vchod {ref}",
+      "cy": "Mynedfa {ref}"
     }
   },
   "pointRendering": [
@@ -68,7 +68,16 @@
             ]
           }
         }
-      ]
+      ],
+      "label": {
+        "mappings": [
+          {
+            "if": "ref~*",
+            "then": "{ref}"
+          }
+        ]
+      },
+      "labelCssClasses": "rounded bg-white px-2"
     }
   ],
   "lineRendering": [],
@@ -578,6 +587,29 @@
           }
         }
       ]
+    },
+    {
+      "id": "ref",
+      "question": {
+        "en": "Does this door have a reference number?",
+        "nl": "Heeft deze toegang een referentienummer?"
+      },
+      "render": {
+        "en": "This door has <b>{ref}</b> as reference number",
+        "nl": "Deze deur heeft <b>{ref}</b> als referentienummer"
+      },
+      "mappings": [
+        {
+          "if": "ref=",
+          "then": {
+            "en": "No reference number",
+            "nl": "Geen referentienummer"
+          }
+        }
+      ],
+      "freeform": {
+        "key": "ref"
+      }
     }
   ],
   "filter": [
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 64a94bc08..3fdf28f25 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -5245,7 +5245,7 @@
             }
         },
         "title": {
-            "render": "Entrada"
+            "render": "Entrada {ref}"
         }
     },
     "etymology": {
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index 4d19e10c0..5ad1e02b9 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -5049,7 +5049,7 @@
             }
         },
         "title": {
-            "render": "Vchod"
+            "render": "Vchod {ref}"
         }
     },
     "etymology": {
diff --git a/langs/layers/cy.json b/langs/layers/cy.json
index aed6d66f8..5aaca51be 100644
--- a/langs/layers/cy.json
+++ b/langs/layers/cy.json
@@ -356,7 +356,7 @@
     "entrance": {
         "name": "Mynedfa",
         "title": {
-            "render": "Mynedfa"
+            "render": "Mynedfa {ref}"
         }
     },
     "extinguisher": {
diff --git a/langs/layers/da.json b/langs/layers/da.json
index c784113f9..3418120da 100644
--- a/langs/layers/da.json
+++ b/langs/layers/da.json
@@ -1564,7 +1564,7 @@
             }
         },
         "title": {
-            "render": "Indgang"
+            "render": "Indgang {ref}"
         }
     },
     "etymology": {
diff --git a/langs/layers/de.json b/langs/layers/de.json
index b122b8aed..497d741b4 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -5204,7 +5204,7 @@
             }
         },
         "title": {
-            "render": "Eingang"
+            "render": "Eingang {ref}"
         }
     },
     "etymology": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index f68d3443f..e1356aa1f 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -5321,13 +5321,22 @@
                 "question": "What is the height of this kerb?",
                 "render": "The kerb height of this door is {kerb:height}"
             },
+            "ref": {
+                "mappings": {
+                    "0": {
+                        "then": "No reference number"
+                    }
+                },
+                "question": "Does this door have a reference number?",
+                "render": "This door has <b>{ref}</b> as reference number"
+            },
             "width": {
                 "question": "What is the width of this door/entrance?",
                 "render": "This door has a width of {canonical(width)}"
             }
         },
         "title": {
-            "render": "Entrance"
+            "render": "Entrance {ref}"
         }
     },
     "etymology": {
@@ -12133,6 +12142,26 @@
                 "question": "How much does one have to pay for these toilets?",
                 "render": "The fee is {charge}"
             },
+            "toilet-drying": {
+                "mappings": {
+                    "0": {
+                        "then": "Electric hand dryers are available for drying hands."
+                    },
+                    "1": {
+                        "then": "Paper towels are available for drying hands."
+                    },
+                    "2": {
+                        "then": "A towel roll cabinet is available for drying hands"
+                    },
+                    "3": {
+                        "then": "A fabric towel available to dry your hands."
+                    },
+                    "4": {
+                        "then": "There are no hand drying facilities available."
+                    }
+                },
+                "question": "Do these toilets have a device to dry your hands?"
+            },
             "toilet-handwashing": {
                 "mappings": {
                     "0": {
@@ -12162,6 +12191,21 @@
                     }
                 }
             },
+            "toilet-supervised": {
+                "mappings": {
+                    "0": {
+                        "then": "There is a person supervising these toilets during (most of) the opening hours"
+                    },
+                    "1": {
+                        "then": "There is a person supervising these toilets, but they are present only during certain times of the opening hours"
+                    },
+                    "2": {
+                        "then": "These toilets are not supervised"
+                    }
+                },
+                "question": "Is this toilets supervised by a person?",
+                "questionHint": "This is typically a person tasked with keeping the toilets clean and collecting the fee"
+            },
             "toilets-changing-table": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 6ece3aa66..59387bb15 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -4903,7 +4903,7 @@
             }
         },
         "title": {
-            "render": "Entrada"
+            "render": "Entrada {ref}"
         }
     },
     "etymology": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index fa7aace69..5b2cfcac2 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -3467,7 +3467,7 @@
             }
         },
         "title": {
-            "render": "Entrée"
+            "render": "Entrée {ref}"
         }
     },
     "etymology": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index adb678192..a58a6d128 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4990,13 +4990,22 @@
                 "question": "Hoe hoog is de drempel?",
                 "render": "De drempel bij deze deur is {kerb:height}"
             },
+            "ref": {
+                "mappings": {
+                    "0": {
+                        "then": "Geen referentienummer"
+                    }
+                },
+                "question": "Heeft deze toegang een referentienummer?",
+                "render": "Deze deur heeft <b>{ref}</b> als referentienummer"
+            },
             "width": {
                 "question": "Wat is de breedte van deze deur/toegang?",
                 "render": "Deze deur heeft een breedte van {canonical(width)}"
             }
         },
         "title": {
-            "render": "Ingang"
+            "render": "Ingang {ref}"
         }
     },
     "etymology": {
@@ -9757,6 +9766,26 @@
                 "question": "Hoeveel moet men betalen om deze toiletten te gebruiken?",
                 "render": "De toiletten gebruiken kost {charge}"
             },
+            "toilet-drying": {
+                "mappings": {
+                    "0": {
+                        "then": "Elektrische handdrogers zijn beschikbaar om handen te drogen."
+                    },
+                    "1": {
+                        "then": "Papieren wegwerphanddoeken zijn beschikbaar om handen te drogen."
+                    },
+                    "2": {
+                        "then": "Een apparaat met een handdoekrol is beschikbaar om handen te drogen"
+                    },
+                    "3": {
+                        "then": "Een stoffen handdoek is beschikbaar om handen te drogen."
+                    },
+                    "4": {
+                        "then": "Er zijn geen handdroogvoorzieningen beschikbaar."
+                    }
+                },
+                "question": "Hebben deze toiletten een apparaat om je handen te drogen?"
+            },
             "toilet-handwashing": {
                 "mappings": {
                     "0": {
@@ -9786,6 +9815,21 @@
                     }
                 }
             },
+            "toilet-supervised": {
+                "mappings": {
+                    "0": {
+                        "then": "Er is een persoon die toezicht houdt op deze toiletten"
+                    },
+                    "1": {
+                        "then": "Er is een persoon die toezicht houdt op deze toiletten, maar deze is slechts op enkele vaste momenten aanwezig"
+                    },
+                    "2": {
+                        "then": "Er is geen persoon die toezicht houdt"
+                    }
+                },
+                "question": "Is er toezicht op deze toilet?",
+                "questionHint": "Deze persoon houdt typisch de toiletten proper en int het toiletgeld"
+            },
             "toilets-changing-table": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/pa_PK.json b/langs/layers/pa_PK.json
index 5e7360bba..a870525b6 100644
--- a/langs/layers/pa_PK.json
+++ b/langs/layers/pa_PK.json
@@ -151,7 +151,7 @@
     "entrance": {
         "name": "دروازہ",
         "title": {
-            "render": "دروازہ"
+            "render": "دروازہ{ref}"
         }
     },
     "food": {
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index c5d216106..fc45953e5 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -1881,7 +1881,7 @@
             }
         },
         "title": {
-            "render": "Wejście"
+            "render": "Wejście {ref}"
         }
     },
     "etymology": {