diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json
index 5c048536d8..3c6312db03 100644
--- a/assets/layers/ticket_validator/ticket_validator.json
+++ b/assets/layers/ticket_validator/ticket_validator.json
@@ -18,6 +18,21 @@
   "tagRenderings": [
     "images",
     "level",
+    {
+      "id": "barrier",
+      "condition": "barrier~*",
+      "render": {
+        "en": "This ticket validator is part of a barrier of type {barrier}"
+      },
+      "mappings": [
+        {
+          "if": "barrier=gate",
+          "then": {
+            "en": "This ticket validator is part of a gate"
+          }
+        }
+      ]
+    },
     {
       "id": "validator-operator",
       "question": {
@@ -45,6 +60,14 @@
               "en": "This ticket validator accepts OV-Chipkaart"
             },
             "hideInAnswer": "_country!=nl"
+          },
+          {
+            "if": "payment:ov-chipkaart=yes",
+            "ifnot": "payment:ov-chipkaart=no",
+            "then": {
+              "en": "This ticket validator accepts OV-Chipkaart"
+            },
+            "hideInAnswer": true
           }
         ]
       }
diff --git a/langs/layers/en.json b/langs/layers/en.json
index d4f2582d4c..6c9bb9b142 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3470,9 +3470,13 @@
                 },
                 "question": "Does this elevator work?"
             },
-            "wikidata.tactile_writing-braille": {
-                "override": {
-                    "question": "In which languages does this elevator have tactile writing (braille)?"
+            "tactile_writing_language": {
+                "render": {
+                    "special": {
+                        "question": "In which languages does this elevator have tactile writing (braille)?",
+                        "render_list_item": "This elevator has tactile writing in {language():font-bold}",
+                        "render_single_language": "This elevator has tactile writing in {language():font-bold}"
+                    }
                 }
             }
         },
@@ -6002,6 +6006,27 @@
             "render": "Bookcase"
         }
     },
+    "railway_platforms": {
+        "description": "Find every platform in the station, and the train routes that use them.",
+        "name": "Railway Platforms",
+        "tagRenderings": {
+            "ref": {
+                "freeform": {
+                    "placeholder": "Platform number"
+                },
+                "question": "What is the number for this platform?",
+                "render": "Platform {ref}"
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Platform {ref}"
+                }
+            },
+            "render": "Platform"
+        }
+    },
     "rainbow_crossings": {
         "description": "A layer showing pedestrian crossings with rainbow paintings",
         "name": "Crossings with rainbow paintings",
@@ -6321,6 +6346,16 @@
                 },
                 "question": "Which genders can enroll at this school?"
             },
+            "school-language": {
+                "render": {
+                    "special": {
+                        "no_known_languages": "The main language of this school is unknown",
+                        "question": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>",
+                        "render_all": "The following languages are used in this school:{list()}",
+                        "render_single_language": "{language():font-bold} is the main language of this school"
+                    }
+                }
+            },
             "school-name": {
                 "question": "What is the name of this school?",
                 "render": "This school is named {name}"
@@ -6357,16 +6392,6 @@
                 },
                 "question": "Does this school target students with a special need? Which structural facilities does this school have?<div class='subtle'>Ad-hoc ",
                 "render": "This school has facilities for students with {school:for}"
-            },
-            "wikidata.school-language": {
-                "override": {
-                    "+mappings": {
-                        "0": {
-                            "then": "The main language of this school is unknown"
-                        }
-                    },
-                    "question": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>"
-                }
             }
         },
         "title": {
@@ -6735,6 +6760,9 @@
                     },
                     "1": {
                         "then": "This is not an escalator"
+                    },
+                    "2": {
+                        "then": "This is not an escalator"
                     }
                 }
             },
@@ -6749,6 +6777,12 @@
                 },
                 "question": "Does this stair have a handrail?"
             },
+            "multilevels": {
+                "override": {
+                    "question": "Between which levels are these stairs?",
+                    "render": "These stairs are between the levels {level}"
+                }
+            },
             "ramp": {
                 "mappings": {
                     "0": {
@@ -6769,9 +6803,24 @@
                 },
                 "question": "Is there a ramp at these stairs?"
             },
-            "wikidata.tactile_writing-braille": {
-                "override": {
-                    "question": "In which languages is there tactile writing (braille) for navigation? <img src='./assets/layers/stairs/Braille_stairs.jpg' style='height: 300px; width: auto; display: block;' />"
+            "tactile_writing": {
+                "mappings": {
+                    "0": {
+                        "then": "There is tactile writing on the handrail"
+                    },
+                    "1": {
+                        "then": "There is no tactile writing on the handrail"
+                    }
+                },
+                "question": "Do these stairs have tactile writing on the handrail?"
+            },
+            "tactile_writing_language": {
+                "render": {
+                    "special": {
+                        "question": "In which languages is there tactile writing (braille) for navigation? <img src='./assets/layers/stairs/Braille_stairs.jpg' style='height: 300px; width: auto; display: block;' />",
+                        "render_list_item": "These stairs have tactile writing in {language():font-bold}",
+                        "render_single_language": "These stairs have tactile writing in {language():font-bold}"
+                    }
                 }
             }
         },
@@ -7103,6 +7152,68 @@
             }
         }
     },
+    "ticket_machine": {
+        "description": "Find ticket machines for public transport tickets",
+        "name": "Ticket Machines",
+        "presets": {
+            "0": {
+                "title": "a ticket machine"
+            }
+        },
+        "tagRenderings": {
+            "operator": {
+                "freeform": {
+                    "placeholder": "Name of the operator"
+                },
+                "question": "Who is the operator of this ticket machine?",
+                "render": "This ticket machine is operated by {operator}"
+            }
+        },
+        "title": {
+            "render": "Ticket Machine"
+        }
+    },
+    "ticket_validator": {
+        "description": "Find ticket validators to validate public transport tickets",
+        "name": "Ticket Validators",
+        "presets": {
+            "0": {
+                "title": "a ticket validator"
+            }
+        },
+        "tagRenderings": {
+            "barrier": {
+                "mappings": {
+                    "0": {
+                        "then": "This ticket validator is part of a gate"
+                    }
+                },
+                "render": "This ticket validator is part of a barrier of type {barrier}"
+            },
+            "payment-options": {
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "This ticket validator accepts OV-Chipkaart"
+                        },
+                        "1": {
+                            "then": "This ticket validator accepts OV-Chipkaart"
+                        }
+                    }
+                }
+            },
+            "validator-operator": {
+                "freeform": {
+                    "placeholder": "Name of the operator"
+                },
+                "question": "Who is the operator of this ticket validator?",
+                "render": "This ticket validator is operated by {operator}"
+            }
+        },
+        "title": {
+            "render": "Ticket Validator"
+        }
+    },
     "toilet": {
         "description": "A layer showing (public) toilets",
         "filter": {