diff --git a/data/presets/highway/crossing/_uncontrolled.json b/data/presets/highway/crossing/_uncontrolled.json
new file mode 100644
index 00000000..de0914b3
--- /dev/null
+++ b/data/presets/highway/crossing/_uncontrolled.json
@@ -0,0 +1,22 @@
+{
+    "icon": "temaki-pedestrian_crosswalk",
+    "fields": [
+        "crossing",
+        "tactile_paving",
+        "crossing/island",
+        "crossing_raised"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "crossing",
+        "crossing": "uncontrolled"
+    },
+    "reference": {
+        "key": "crossing",
+        "value": "uncontrolled"
+    },
+    "name": "Marked Crosswalk",
+    "searchable": false
+}
diff --git a/data/presets/highway/crossing/marked.json b/data/presets/highway/crossing/marked.json
index 94a83f19..c0892803 100644
--- a/data/presets/highway/crossing/marked.json
+++ b/data/presets/highway/crossing/marked.json
@@ -14,8 +14,8 @@
         "crossing": "marked"
     },
     "reference": {
-        "key": "highway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "marked"
     },
     "terms": [
         "zebra crossing",
diff --git a/data/presets/highway/cycleway/crossing/marked.json b/data/presets/highway/cycleway/crossing/marked.json
index 31a4e838..c469de35 100644
--- a/data/presets/highway/cycleway/crossing/marked.json
+++ b/data/presets/highway/cycleway/crossing/marked.json
@@ -16,8 +16,8 @@
         "crossing": "marked"
     },
     "reference": {
-        "key": "cycleway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "marked"
     },
     "terms": [
         "cycle crosswalk",
diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
index cce9e9f1..11e69f6e 100644
--- a/data/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -16,8 +16,8 @@
         "crossing": "unmarked"
     },
     "reference": {
-        "key": "cycleway",
-        "value": "crossing"
+        "key": "crossing",
+        "value": "unmarked"
     },
     "terms": [
         "cycle path crossing",
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 2799cd2b..5b739e1b 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -4558,6 +4558,11 @@ en:
         name: Amphitheatre
         # 'terms: open air,outdoor,greek,ampi'
         terms: <translate with synonyms or related terms for 'Amphitheatre', separated by commas>
+      amenity/ticket_validator:
+        # amenity=ticket_validator | ticket puncher, punching machine, ticket marker | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Ticket Validator
+        # 'terms: ticket,validator,puncher'
+        terms: <translate with synonyms or related terms for 'Ticket Validator', separated by commas>
       amenity/toilets:
         # amenity=toilets | Restroom, Bathroom, Lavatory, Water Closet | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Toilets
@@ -5636,7 +5641,7 @@ en:
         # 'terms: air raid,loud,noise,storm,tornado,warning'
         terms: <translate with synonyms or related terms for 'Siren', separated by commas>
       emergency/water_reservoir:
-        # emergency=water_tank + landuse=reservoir | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # emergency=water_tank + natural=water + water=reservoir | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Emergency Water Reservoir
         # 'terms: basin,reservoir,extinguishing,firefighting'
         terms: <translate with synonyms or related terms for 'Emergency Water Reservoir', separated by commas>
@@ -5865,6 +5870,9 @@ en:
         name: Crossing With Pedestrian Signals
         # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights),flat top,hump,speed,slow'
         terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
+      highway/crossing/uncontrolled:
+        # highway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Marked Crosswalk
       highway/crossing/unmarked:
         # highway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Crossing