diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json
new file mode 100644
index 00000000..bcf16fe2
--- /dev/null
+++ b/data/fields/crossing_raised.json
@@ -0,0 +1,11 @@
+{
+    "key": "traffic_calming",
+    "type": "defaultCheck",
+    "label": "Raised",
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "table": "Yes"
+        }
+    }
+}
diff --git a/data/presets/highway/crossing/_zebra-raised.json b/data/presets/highway/crossing/_zebra-raised.json
deleted file mode 100644
index 6f420ff7..00000000
--- a/data/presets/highway/crossing/_zebra-raised.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "icon": "temaki-pedestrian_crosswalk",
-    "fields": [
-        "crossing",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "highway": "crossing",
-        "crossing": "zebra",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "name": "Marked Crosswalk (Raised)",
-    "searchable": false
-}
diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
index 7ede4d2d..23b0d728 100644
--- a/data/presets/highway/crossing/_zebra.json
+++ b/data/presets/highway/crossing/_zebra.json
@@ -3,7 +3,8 @@
     "fields": [
         "crossing",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "vertex"
diff --git a/data/presets/highway/crossing/marked-raised.json b/data/presets/highway/crossing/marked-raised.json
deleted file mode 100644
index 684f1a0b..00000000
--- a/data/presets/highway/crossing/marked-raised.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "icon": "temaki-pedestrian_crosswalk",
-    "fields": [
-        "crossing",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "highway": "crossing",
-        "crossing": "marked",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "terms": [
-        "zebra crossing",
-        "marked crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ],
-    "name": "Marked Crosswalk (Raised)"
-}
diff --git a/data/presets/highway/crossing/marked.json b/data/presets/highway/crossing/marked.json
index ea2c976f..94a83f19 100644
--- a/data/presets/highway/crossing/marked.json
+++ b/data/presets/highway/crossing/marked.json
@@ -3,7 +3,8 @@
     "fields": [
         "crossing",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "vertex"
@@ -19,7 +20,11 @@
     "terms": [
         "zebra crossing",
         "marked crossing",
-        "crosswalk"
+        "crosswalk",
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/crossing/signals-raised.json b/data/presets/highway/crossing/signals-raised.json
deleted file mode 100644
index b6396944..00000000
--- a/data/presets/highway/crossing/signals-raised.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "icon": "temaki-railway_signals",
-    "fields": [
-        "crossing",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "highway": "crossing",
-        "crossing": "traffic_signals",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "name": "Crossing With Pedestrian Signals (Raised)",
-    "terms": [
-        "pedestrian traffic lights",
-        "pedestrian traffic signals",
-        "pedestrian crossing (lights)",
-        "bicycle crossing (lights)",
-        "crosswalk (lights)",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ]
-}
diff --git a/data/presets/highway/crossing/signals.json b/data/presets/highway/crossing/signals.json
index d79891e6..3d4c26c7 100644
--- a/data/presets/highway/crossing/signals.json
+++ b/data/presets/highway/crossing/signals.json
@@ -3,7 +3,8 @@
     "fields": [
         "crossing",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "vertex"
@@ -22,6 +23,10 @@
       "pedestrian traffic signals",
       "pedestrian crossing (lights)",
       "bicycle crossing (lights)",
-      "crosswalk (lights)"
+      "crosswalk (lights)",
+      "flat top",
+      "hump",
+      "speed",
+      "slow"
     ]
 }
diff --git a/data/presets/highway/crossing/unmarked-raised.json b/data/presets/highway/crossing/unmarked-raised.json
deleted file mode 100644
index fff5477f..00000000
--- a/data/presets/highway/crossing/unmarked-raised.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "icon": "temaki-pedestrian",
-    "fields": [
-        "crossing",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "highway": "crossing",
-        "crossing": "unmarked",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "terms": [
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ],
-    "name": "Unmarked Crossing (Raised)"
-}
diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
index 94aa690f..94a9483f 100644
--- a/data/presets/highway/crossing/unmarked.json
+++ b/data/presets/highway/crossing/unmarked.json
@@ -3,7 +3,8 @@
     "fields": [
         "crossing",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "vertex"
@@ -16,5 +17,14 @@
         "key": "crossing",
         "value": "unmarked"
     },
+    "terms": [
+        "unmarked foot path crossing",
+        "unmarked crosswalk",
+        "unmarked pedestrian crossing",
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ],
     "name": "Unmarked Crossing"
 }
diff --git a/data/presets/highway/footway/_zebra-raised.json b/data/presets/highway/footway/_zebra-raised.json
deleted file mode 100644
index 2c34240e..00000000
--- a/data/presets/highway/footway/_zebra-raised.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "icon": "temaki-pedestrian_crosswalk",
-    "fields": [
-        "crossing",
-        "access",
-        "surface",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "footway",
-        "footway": "crossing",
-        "crossing": "zebra",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "terms": [
-        "zebra crossing",
-        "marked crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ],
-    "name": "Marked Crosswalk (Raised)",
-    "searchable": false
-}
diff --git a/data/presets/highway/footway/_zebra.json b/data/presets/highway/footway/_zebra.json
index 9aa730e9..2ed5dfc5 100644
--- a/data/presets/highway/footway/_zebra.json
+++ b/data/presets/highway/footway/_zebra.json
@@ -5,7 +5,8 @@
         "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "line"
@@ -19,11 +20,6 @@
         "key": "crossing",
         "value": "zebra"
     },
-    "terms": [
-        "zebra crossing",
-        "marked crossing",
-        "crosswalk"
-    ],
     "name": "Marked Crosswalk",
     "searchable": false
 }
diff --git a/data/presets/highway/footway/marked-raised.json b/data/presets/highway/footway/marked-raised.json
deleted file mode 100644
index 9bb6bc11..00000000
--- a/data/presets/highway/footway/marked-raised.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "icon": "temaki-pedestrian_crosswalk",
-    "fields": [
-        "crossing",
-        "access",
-        "surface",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "footway",
-        "footway": "crossing",
-        "crossing": "marked",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "terms": [
-        "zebra crossing",
-        "marked crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ],
-    "name": "Marked Crosswalk (Raised)"
-}
diff --git a/data/presets/highway/footway/marked.json b/data/presets/highway/footway/marked.json
index 3418f277..937a22a6 100644
--- a/data/presets/highway/footway/marked.json
+++ b/data/presets/highway/footway/marked.json
@@ -5,7 +5,8 @@
         "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "line"
@@ -23,7 +24,12 @@
         "marked foot path crossing",
         "marked crossing",
         "marked pedestrian crosswalk",
-        "zebra crossing"
+        "zebra crossing",
+        "crosswalk",
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/footway/signals-raised.json b/data/presets/highway/footway/signals-raised.json
deleted file mode 100644
index 085b7d20..00000000
--- a/data/presets/highway/footway/signals-raised.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "icon": "temaki-railway_signals",
-    "fields": [
-        "crossing",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "footway",
-        "footway": "crossing",
-        "crossing": "traffic_signals",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "name": "Crossing With Pedestrian Signals (Raised)",
-    "terms": [
-        "pedestrian traffic lights",
-        "pedestrian traffic signals",
-        "pedestrian crossing (lights)",
-        "bicycle crossing (lights)",
-        "crosswalk (lights)",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ]
-}
\ No newline at end of file
diff --git a/data/presets/highway/footway/signals.json b/data/presets/highway/footway/signals.json
index f779fefa..8aa501dc 100644
--- a/data/presets/highway/footway/signals.json
+++ b/data/presets/highway/footway/signals.json
@@ -1,28 +1,35 @@
-{
-    "icon": "temaki-railway_signals",
-    "fields": [
-        "crossing",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "footway",
-        "footway": "crossing",
-        "crossing": "traffic_signals"
-    },
-    "reference": {
-        "key": "crossing",
-        "value": "traffic_signals"
-    },
-    "name": "Crossing With Pedestrian Signals",
-    "terms": [
-      "pedestrian traffic lights",
-      "pedestrian traffic signals",
-      "pedestrian crossing (lights)",
-      "bicycle crossing (lights)",
-      "crosswalk (lights)"
-    ]
+{
+    "icon": "temaki-railway_signals",
+    "fields": [
+        "crossing",
+        "access",
+        "surface",
+        "tactile_paving",
+        "crossing/island",
+        "crossing_raised"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "traffic_signals"
+    },
+    "reference": {
+        "key": "crossing",
+        "value": "traffic_signals"
+    },
+    "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"
+    ]
 }
\ No newline at end of file
diff --git a/data/presets/highway/footway/unmarked-raised.json b/data/presets/highway/footway/unmarked-raised.json
deleted file mode 100644
index b1c183b1..00000000
--- a/data/presets/highway/footway/unmarked-raised.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "icon": "temaki-pedestrian",
-    "fields": [
-        "crossing",
-        "access",
-        "surface",
-        "tactile_paving",
-        "crossing/island"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "highway": "footway",
-        "footway": "crossing",
-        "crossing": "unmarked",
-        "traffic_calming": "table"
-    },
-    "reference": {
-        "key": "traffic_calming",
-        "value": "table"
-    },
-    "terms": [
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
-    ],
-    "name": "Unmarked Crossing (Raised)"
-}
diff --git a/data/presets/highway/footway/unmarked.json b/data/presets/highway/footway/unmarked.json
index 1c7755c7..2180e996 100644
--- a/data/presets/highway/footway/unmarked.json
+++ b/data/presets/highway/footway/unmarked.json
@@ -5,7 +5,8 @@
         "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised"
     ],
     "geometry": [
         "line"
@@ -22,7 +23,11 @@
     "terms": [
         "unmarked foot path crossing",
         "unmarked crosswalk",
-        "unmarked pedestrian crossing"
+        "unmarked pedestrian crossing",
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
     ],
     "name": "Unmarked Crossing"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 31e97aa9..4afc52a3 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -680,6 +680,14 @@ en:
       crossing/light:
         # 'crossing:light=*'
         label: Lights
+      crossing_raised:
+        # traffic_calming=*
+        label: Raised
+        options:
+          # traffic_calming=table
+          table: 'Yes'
+          # traffic_calming=undefined
+          undefined: 'No'
       cuisine:
         # cuisine=*
         label: Cuisines
@@ -5804,38 +5812,21 @@ en:
       highway/crossing/marked:
         # 'highway=crossing + crossing=marked\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Marked Crosswalk
-        # 'terms: zebra crossing,marked crossing,crosswalk'
-        terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
-      highway/crossing/marked-raised:
-        # 'highway=crossing + crossing=marked + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Marked Crosswalk (Raised)
         # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
       highway/crossing/signals:
         # 'highway=crossing + crossing=traffic_signals\n\nTranslate 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: '<translate with synonyms or related terms for ''Crossing With Pedestrian Signals'', separated by commas>'
-      highway/crossing/signals-raised:
-        # 'highway=crossing + crossing=traffic_signals + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Crossing With Pedestrian Signals (Raised)
         # '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 (Raised)'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Crossing With Pedestrian Signals'', separated by commas>'
       highway/crossing/unmarked:
         # 'highway=crossing + crossing=unmarked\n\nTranslate 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,flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing'', separated by commas>'
-      highway/crossing/unmarked-raised:
-        # 'highway=crossing + crossing=unmarked + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Unmarked Crossing (Raised)
-        # 'terms: flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'
       highway/crossing/zebra:
         # 'highway=crossing + crossing=zebra\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Marked Crosswalk
-      highway/crossing/zebra-raised:
-        # 'highway=crossing + crossing=zebra + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Marked Crosswalk (Raised)
       highway/cycleway:
         # 'highway=cycleway\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Cycle Path
@@ -5900,34 +5891,26 @@ en:
       highway/footway/marked:
         # 'highway=footway + footway=crossing + crossing=marked\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Marked Crosswalk
-        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing'
+        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk,flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
-      highway/footway/marked-raised:
-        # 'highway=footway + footway=crossing + crossing=marked + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Marked Crosswalk (Raised)
-        # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
       highway/footway/sidewalk:
         # 'footway=sidewalk\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Sidewalk
         # 'terms: pavement,sidepath'
         terms: '<translate with synonyms or related terms for ''Sidewalk'', separated by commas>'
+      highway/footway/signals:
+        # 'highway=footway + footway=crossing + crossing=traffic_signals\n\nTranslate 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),flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Crossing With Pedestrian Signals'', separated by commas>'
       highway/footway/unmarked:
         # 'highway=footway + footway=crossing + crossing=unmarked\n\nTranslate 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 foot path crossing,unmarked crosswalk,unmarked pedestrian crossing,flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing'', separated by commas>'
-      highway/footway/unmarked-raised:
-        # 'highway=footway + footway=crossing + crossing=unmarked + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Unmarked Crossing (Raised)
-        # 'terms: flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'
       highway/footway/zebra:
         # 'highway=footway + footway=crossing + crossing=zebra\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Marked Crosswalk
-      highway/footway/zebra-raised:
-        # 'highway=footway + footway=crossing + crossing=zebra + traffic_calming=table\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Marked Crosswalk (Raised)
       highway/give_way:
         # 'highway=give_way\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Yield Sign
@@ -6823,6 +6806,11 @@ en:
         name: Field Hockey Pitch
         # 'terms: landhockey'
         terms: '<translate with synonyms or related terms for ''Field Hockey Pitch'', separated by commas>'
+      leisure/pitch/futsal:
+        # 'leisure=pitch + sport=futsal\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Futsal Court
+        # 'terms: minifootball,five-a-side soccer'
+        terms: '<translate with synonyms or related terms for ''Futsal Court'', separated by commas>'
       leisure/pitch/horseshoes:
         # 'leisure=pitch + sport=horseshoes\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Horseshoes Pit