diff --git a/data/presets.yaml b/data/presets.yaml
index 283371dca..10167ae48 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4020,7 +4020,7 @@ en:
       highway/footway:
         # highway=footway
         name: Foot Path
-        # 'terms: hike,hiking,trackway,trail,walk'
+        # 'terms: hike,hiking,promenade,trackway,trail,walk'
         terms: '<translate with synonyms or related terms for ''Foot Path'', separated by commas>'
       highway/footway/conveying:
         # 'highway=footway, conveying=*'
@@ -4187,7 +4187,7 @@ en:
       highway/steps:
         # highway=steps
         name: Steps
-        # 'terms: stairs,staircase'
+        # 'terms: stairs,staircase,stairway'
         terms: '<translate with synonyms or related terms for ''Steps'', separated by commas>'
       highway/steps/conveying:
         # 'highway=steps, conveying=*'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e08c7eb0f..2624a4dd6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -426,7 +426,7 @@
     "highway/crossing/unmarked": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "crossing"}, "reference": {"key": "highway", "value": "crossing"}, "terms": [], "name": "Unmarked Crossing"},
     "highway/cycleway": {"icon": "maki-bicycle", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered", "dog"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"},
     "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
-    "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"},
+    "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"},
     "highway/footway/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "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},
     "highway/footway/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false},
     "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
@@ -462,7 +462,7 @@
     "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
     "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
     "highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
-    "highway/steps": {"icon": "iD-highway-steps", "fields": ["surface", "lit", "width", "incline_steps", "handrail", "step_count"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase"], "name": "Steps"},
+    "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "handrail", "step_count", "surface", "lit", "width"], "moreFields": ["covered", "dog"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
     "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
     "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
     "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index f43435d30..ca4b89ba4 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -21,6 +21,7 @@
     "terms": [
         "hike",
         "hiking",
+        "promenade",
         "trackway",
         "trail",
         "walk"
diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json
index 03f3a61fe..f8ab6b936 100644
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -1,12 +1,16 @@
 {
     "icon": "iD-highway-steps",
     "fields": [
-        "surface",
-        "lit",
-        "width",
         "incline_steps",
         "handrail",
-        "step_count"
+        "step_count",
+        "surface",
+        "lit",
+        "width"
+    ],
+    "moreFields": [
+        "covered",
+        "dog"
     ],
     "geometry": [
         "line"
@@ -16,7 +20,8 @@
     },
     "terms": [
         "stairs",
-        "staircase"
+        "staircase",
+        "stairway"
     ],
     "name": "Steps"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1b8f2ede1..e26a1eb25 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5601,7 +5601,7 @@
                 },
                 "highway/footway": {
                     "name": "Foot Path",
-                    "terms": "hike,hiking,trackway,trail,walk"
+                    "terms": "hike,hiking,promenade,trackway,trail,walk"
                 },
                 "highway/footway/zebra-raised": {
                     "name": "Marked Crosswalk (Raised)",
@@ -5745,7 +5745,7 @@
                 },
                 "highway/steps": {
                     "name": "Steps",
-                    "terms": "stairs,staircase"
+                    "terms": "stairs,staircase,stairway"
                 },
                 "highway/steps/conveying": {
                     "name": "Escalator",