diff --git a/data/fields/crossing/markings_yes.json b/data/fields/crossing/markings_yes.json
new file mode 100644
index 00000000..579205dc
--- /dev/null
+++ b/data/fields/crossing/markings_yes.json
@@ -0,0 +1,7 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "{crossing/markings}",
+    "stringsCrossReference": "{crossing/markings}",
+    "default": "yes"
+}
diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json
index 9ec22411..4d53aa5f 100644
--- a/data/presets/highway/crossing/_marked.json
+++ b/data/presets/highway/crossing/_marked.json
@@ -17,6 +17,11 @@
         "highway": "crossing",
         "crossing": "marked"
     },
+    "addTags": {
+        "highway": "crossing",
+        "crossing": "marked",
+        "crossing:markings": "yes"
+    },
     "reference": {
         "key": "crossing",
         "value": "marked"
@@ -26,6 +31,6 @@
         "marked crossing",
         "crosswalk"
     ],
-    "name": "Marked Crosswalk",
+    "name": "{highway/crossing/uncontrolled}",
     "searchable": false
 }
diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
index 87de5a7e..e672ea4c 100644
--- a/data/presets/highway/crossing/_zebra.json
+++ b/data/presets/highway/crossing/_zebra.json
@@ -18,6 +18,6 @@
         "key": "crossing",
         "value": "zebra"
     },
-    "name": "Marked Crosswalk",
+    "name": "{highway/crossing/uncontrolled}",
     "searchable": false
 }
diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json
index 428406f2..a865f9aa 100644
--- a/data/presets/highway/crossing/traffic_signals.json
+++ b/data/presets/highway/crossing/traffic_signals.json
@@ -28,10 +28,10 @@
     },
     "name": "Crossing With Pedestrian Signals",
     "terms": [
-        "pedestrian traffic lights",
-        "pedestrian traffic signals",
-        "pedestrian crossing (lights)",
         "bicycle crossing (lights)",
-        "crosswalk (lights)"
+        "crosswalk (lights)",
+        "pedestrian crossing (lights)",
+        "pedestrian traffic lights",
+        "pedestrian traffic signals"
     ]
 }
diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json
index 1fb94225..dcb386f0 100644
--- a/data/presets/highway/crossing/uncontrolled.json
+++ b/data/presets/highway/crossing/uncontrolled.json
@@ -4,7 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
+        "crossing/markings_yes",
         "crossing_raised"
     ],
     "geometry": [
@@ -18,5 +18,12 @@
         "key": "crossing",
         "value": "uncontrolled"
     },
-    "name": "Marked Crosswalk"
+    "terms": [
+        "marked foot path crossing",
+        "marked crosswalk",
+        "marked pedestrian crosswalk",
+        "zebra crossing",
+        "crosswalk"
+    ],
+    "name": "Marked Crossing"
 }
diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
index 0640f22f..7f532cde 100644
--- a/data/presets/highway/crossing/unmarked.json
+++ b/data/presets/highway/crossing/unmarked.json
@@ -16,13 +16,18 @@
         "highway": "crossing",
         "crossing": "unmarked"
     },
+    "addTags": {
+        "highway": "crossing",
+        "crossing": "unmarked",
+        "crossing:markings": "no"
+    },
     "reference": {
         "key": "crossing",
         "value": "unmarked"
     },
     "terms": [
-        "unmarked foot path crossing",
         "unmarked crosswalk",
+        "unmarked foot path crossing",
         "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
index ba1ecf02..884895fa 100644
--- a/data/presets/highway/cycleway/crossing/_marked.json
+++ b/data/presets/highway/cycleway/crossing/_marked.json
@@ -17,11 +17,17 @@
         "cycleway": "crossing",
         "crossing": "marked"
     },
+    "addTags": {
+        "highway": "cycleway",
+        "cycleway": "crossing",
+        "crossing": "marked",
+        "crossing:markings": "yes"
+    },
     "reference": {
         "key": "crossing",
         "value": "marked"
     },
     "matchScore": 0.95,
-    "name": "Marked Cycle Crossing",
+    "name": "{highway/cycleway/crossing/uncontrolled}",
     "searchable": false
 }
diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
index 566bb1de..921e579d 100644
--- a/data/presets/highway/cycleway/crossing/traffic_signals.json
+++ b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -25,10 +25,10 @@
         "value": "traffic_signals"
     },
     "terms": [
-        "cycle path crossing",
-        "cycleway crossing",
         "bicycle crossing",
-        "bike crossing"
+        "bike crossing",
+        "cycle path crossing",
+        "cycleway crossing"
     ],
     "matchScore": 0.95,
     "name": "Cycle Crossing With Traffic Signals"
diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
index e65766f8..dc72163e 100644
--- a/data/presets/highway/cycleway/crossing/uncontrolled.json
+++ b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -6,7 +6,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
+        "crossing/markings_yes",
         "crossing_raised",
         "access"
     ],
diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
index d3a3223c..a008c3ee 100644
--- a/data/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -16,15 +16,21 @@
         "cycleway": "crossing",
         "crossing": "unmarked"
     },
+    "addTags": {
+        "highway": "cycleway",
+        "cycleway": "crossing",
+        "crossing": "unmarked",
+        "crossing:markings": "no"
+    },
     "reference": {
         "key": "crossing",
         "value": "unmarked"
     },
     "terms": [
-        "cycle path crossing",
-        "cycleway crossing",
+        "bike crossing",
         "bicycle crossing",
-        "bike crossing"
+        "cycle path crossing",
+        "cycleway crossing"
     ],
     "matchScore": 0.95,
     "name": "Unmarked Cycle Crossing"
diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
index 78154a08..ed53ca7e 100644
--- a/data/presets/highway/footway/crossing/_marked.json
+++ b/data/presets/highway/footway/crossing/_marked.json
@@ -20,10 +20,16 @@
         "footway": "crossing",
         "crossing": "marked"
     },
+    "addTags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "marked",
+        "crossing:markings": "yes"
+    },
     "reference": {
         "key": "crossing",
         "value": "marked"
     },
-    "name": "Marked Crossing",
+    "name": "{highway/footway/crossing/uncontrolled}",
     "searchable": false
 }
diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
index ceeaab56..bd0ae076 100644
--- a/data/presets/highway/footway/crossing/_zebra.json
+++ b/data/presets/highway/footway/crossing/_zebra.json
@@ -21,6 +21,6 @@
         "key": "crossing",
         "value": "zebra"
     },
-    "name": "Marked Crossing",
+    "name": "{highway/footway/crossing/uncontrolled}",
     "searchable": false
 }
diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
index cc519757..33cba869 100644
--- a/data/presets/highway/footway/crossing/traffic_signals.json
+++ b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -31,10 +31,9 @@
     },
     "name": "Crossing With Pedestrian Signals",
     "terms": [
+        "crosswalk (lights)",
         "pedestrian traffic lights",
         "pedestrian traffic signals",
-        "pedestrian crossing (lights)",
-        "bicycle crossing (lights)",
-        "crosswalk (lights)"
+        "pedestrian crossing (lights)"
     ]
 }
diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
index caa2a565..8b3fe95d 100644
--- a/data/presets/highway/footway/crossing/uncontrolled.json
+++ b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -5,7 +5,7 @@
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing/markings",
+        "crossing/markings_yes",
         "crossing_raised",
         "access"
     ],
diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json
index 3b24adc5..c9ca1562 100644
--- a/data/presets/highway/footway/crossing/unmarked.json
+++ b/data/presets/highway/footway/crossing/unmarked.json
@@ -19,13 +19,19 @@
         "footway": "crossing",
         "crossing": "unmarked"
     },
+    "addTags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "unmarked",
+        "crossing:markings": "no"
+    },
     "reference": {
         "key": "crossing",
         "value": "unmarked"
     },
     "terms": [
-        "unmarked foot path crossing",
         "unmarked crosswalk",
+        "unmarked foot path crossing",
         "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 1b81f300..a6a9fc2f 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -996,6 +996,8 @@ en:
           #paired': crossing:markings=zebra:paired
           zebra:paired: Paired Longitudinal Bars
         terms: '[translate with synonyms or related terms for ''Crossing Markings'', separated by commas]'
+      crossing/markings_yes:
+        # crossing:markings=*
       crossing_raised:
         # traffic_calming=*
         label: Raised
@@ -7253,24 +7255,23 @@ en:
         name: Crossing
       highway/crossing/marked:
         # highway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Crosswalk
       highway/crossing/traffic_signals:
         # highway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
+        # 'terms: bicycle crossing (lights),crosswalk (lights),pedestrian crossing (lights),pedestrian traffic lights,pedestrian traffic signals'
         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
-        terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
+        name: Marked Crossing
+        # 'terms: marked foot path crossing,marked crosswalk,marked pedestrian crosswalk,zebra crossing,crosswalk'
+        terms: <translate with synonyms or related terms for 'Marked Crossing', separated by commas>
       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
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
+        # 'terms: unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing'
         terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
       highway/crossing/zebra:
         # highway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Crosswalk
       highway/cycleway:
         # highway=cycleway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Cycle Path
@@ -7291,11 +7292,10 @@ en:
         terms: <translate with synonyms or related terms for 'Cycle & Foot Crossing', separated by commas>
       highway/cycleway/crossing/marked:
         # highway=cycleway + cycleway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Cycle Crossing
       highway/cycleway/crossing/traffic_signals:
         # highway=cycleway + cycleway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Cycle Crossing With Traffic Signals
-        # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
+        # 'terms: bicycle crossing,bike crossing,cycle path crossing,cycleway crossing'
         terms: <translate with synonyms or related terms for 'Cycle Crossing With Traffic Signals', separated by commas>
       highway/cycleway/crossing/uncontrolled:
         # highway=cycleway + cycleway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -7305,7 +7305,7 @@ en:
       highway/cycleway/crossing/unmarked:
         # highway=cycleway + cycleway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Cycle Crossing
-        # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
+        # 'terms: bike crossing,bicycle crossing,cycle path crossing,cycleway crossing'
         terms: <translate with synonyms or related terms for 'Unmarked Cycle Crossing', separated by commas>
       highway/cycleway/moped_link-NL:
         # highway=cycleway + bicycle=no + moped=designated | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -7356,11 +7356,10 @@ en:
         name: Pedestrian Crossing
       highway/footway/crossing/marked:
         # highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Crossing
       highway/footway/crossing/traffic_signals:
         # highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
+        # 'terms: crosswalk (lights),pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights)'
         terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
       highway/footway/crossing/uncontrolled:
         # highway=footway + footway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -7370,11 +7369,10 @@ en:
       highway/footway/crossing/unmarked:
         # highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Crossing
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
+        # 'terms: unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing'
         terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
       highway/footway/crossing/zebra:
         # highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Crossing
       highway/footway/informal:
         # highway=footway + informal=yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Informal Foot Path