diff --git a/data/presets.yaml b/data/presets.yaml
index 3ff021938..775a11ab4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -786,6 +786,8 @@ en:
           'yes': Yes (unspecified)
         # electrified field placeholder
         placeholder: 'Contact Line, Electrified Rail...'
+        # 'terms: contact line,powered,third rail'
+        terms: '[translate with synonyms or related terms for ''Electrification'', separated by commas]'
       elevation:
         # ele=*
         label: Elevation
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 695524647..052ac8354 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -131,7 +131,7 @@
     "drinking_water": {"key": "drinking_water", "type": "check", "label": "Drinkable", "terms": ["drinkworthy", "potable"]},
     "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"},
     "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"},
-    "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}},
+    "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}, "terms": ["contact line", "powered", "third rail"]},
     "elevation": {"key": "ele", "type": "number", "icon": "elevation", "universal": true, "label": "Elevation", "terms": ["altitude"]},
     "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"},
     "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
diff --git a/data/presets/fields/electrified.json b/data/presets/fields/electrified.json
index 71cc4a3ff..887f6a546 100644
--- a/data/presets/fields/electrified.json
+++ b/data/presets/fields/electrified.json
@@ -10,5 +10,10 @@
             "yes": "Yes (unspecified)",
             "no": "No"
         }
-    }
+    },
+    "terms": [
+        "contact line",
+        "powered",
+        "third rail"
+    ]
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index fa6beac8e..2e22a1137 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -995,27 +995,27 @@
     "railway/platform": {"icon": "temaki-sign_and_pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false},
     "railway/station": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "matchScore": 0.95, "name": "Train Station", "searchable": false},
     "railway/tram_stop": {"icon": "temaki-tram", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"railway": "tram_stop"}, "name": "Tram Stopping Position", "searchable": false},
-    "railway/abandoned": {"icon": "temaki-railway_track_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"},
+    "railway/abandoned": {"icon": "temaki-railway_track_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered", "incline"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"},
     "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"},
-    "railway/construction": {"icon": "temaki-railway_track_unfinished", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "name": "Railway Under Construction"},
+    "railway/construction": {"icon": "temaki-railway_track_unfinished", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "incline", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "name": "Railway Under Construction"},
     "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"},
     "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"},
-    "railway/disused": {"icon": "temaki-railway_track", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
-    "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "structure", "gauge", "service_rail"], "moreFields": ["covered"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"},
+    "railway/disused": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
+    "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "incline", "structure", "gauge", "service_rail"], "moreFields": ["covered", "electrified", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"},
     "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
-    "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
+    "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "incline", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
     "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"},
-    "railway/miniature": {"icon": "temaki-railway_track_mini", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"},
-    "railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "operator", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
-    "railway/narrow_gauge": {"icon": "temaki-railway_track_narrow", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
-    "railway/rail": {"icon": "temaki-railway_track", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"},
+    "railway/miniature": {"icon": "temaki-railway_track_mini", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"},
+    "railway/monorail": {"icon": "temaki-monorail", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
+    "railway/narrow_gauge": {"icon": "temaki-railway_track_narrow", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
+    "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"},
     "railway/rail/highspeed": {"icon": "temaki-railway_track", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"},
     "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
     "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
-    "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
+    "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
     "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
-    "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
+    "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
     "railway/yard": {"icon": "maki-rail", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
     "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "network/type", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json
index 542c43437..7f4d120dc 100644
--- a/data/presets/presets/railway/abandoned.json
+++ b/data/presets/presets/railway/abandoned.json
@@ -7,7 +7,8 @@
         "usage_rail"
     ],
     "moreFields": [
-        "covered"
+        "covered",
+        "incline"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/construction.json b/data/presets/presets/railway/construction.json
index 134f804ff..f6b50ba8b 100644
--- a/data/presets/presets/railway/construction.json
+++ b/data/presets/presets/railway/construction.json
@@ -13,6 +13,7 @@
         "covered",
         "frequency_electrified",
         "highspeed",
+        "incline",
         "maxspeed",
         "service_rail",
         "usage_rail",
diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json
index 6af60280c..4a7bfa4c2 100644
--- a/data/presets/presets/railway/disused.json
+++ b/data/presets/presets/railway/disused.json
@@ -1,13 +1,11 @@
 {
     "icon": "temaki-railway_track",
     "fields": [
-        "operator",
-        "structure",
-        "service_rail",
-        "usage_rail"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered"
+        "{railway/light_rail}",
+        "highspeed"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json
index 3f5255c9c..a118f9ac5 100644
--- a/data/presets/presets/railway/funicular.json
+++ b/data/presets/presets/railway/funicular.json
@@ -3,12 +3,17 @@
     "fields": [
         "name",
         "operator",
+        "incline",
         "structure",
         "gauge",
         "service_rail"
     ],
     "moreFields": [
-        "covered"
+        "covered",
+        "electrified",
+        "frequency_electrified",
+        "maxspeed",
+        "voltage_electrified"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json
index e345eb28f..2814b5664 100644
--- a/data/presets/presets/railway/light_rail.json
+++ b/data/presets/presets/railway/light_rail.json
@@ -1,11 +1,18 @@
 {
     "icon": "temaki-light_rail",
     "fields": [
-        "{railway/rail}"
+        "name",
+        "operator",
+        "structure",
+        "gauge",
+        "electrified",
+        "service_rail",
+        "usage_rail"
     ],
     "moreFields": [
         "covered",
         "frequency_electrified",
+        "incline",
         "maxspeed",
         "voltage_electrified"
     ],
diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json
index 5d92e9e78..224d9fc9c 100644
--- a/data/presets/presets/railway/miniature.json
+++ b/data/presets/presets/railway/miniature.json
@@ -1,17 +1,10 @@
 {
     "icon": "temaki-railway_track_mini",
     "fields": [
-        "name",
-        "structure",
-        "gauge",
-        "electrified",
-        "service_rail"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered",
-        "frequency_electrified",
-        "maxspeed",
-        "voltage_electrified"
+        "{railway/light_rail}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
index 9d024e04d..983dcb9e2 100644
--- a/data/presets/presets/railway/monorail.json
+++ b/data/presets/presets/railway/monorail.json
@@ -1,18 +1,10 @@
 {
     "icon": "temaki-monorail",
     "fields": [
-        "name",
-        "operator",
-        "structure",
-        "electrified",
-        "service_rail",
-        "usage_rail"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered",
-        "frequency_electrified",
-        "maxspeed",
-        "voltage_electrified"
+        "{railway/light_rail}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json
index 98d7e4f29..124597a53 100644
--- a/data/presets/presets/railway/narrow_gauge.json
+++ b/data/presets/presets/railway/narrow_gauge.json
@@ -1,13 +1,10 @@
 {
     "icon": "temaki-railway_track_narrow",
     "fields": [
-        "{railway/rail}"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered",
-        "frequency_electrified",
-        "maxspeed",
-        "voltage_electrified"
+        "{railway/light_rail}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
index a337468a4..b7064226a 100644
--- a/data/presets/presets/railway/rail.json
+++ b/data/presets/presets/railway/rail.json
@@ -1,20 +1,11 @@
 {
     "icon": "temaki-railway_track",
     "fields": [
-        "name",
-        "operator",
-        "structure",
-        "gauge",
-        "electrified",
-        "service_rail",
-        "usage_rail"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered",
-        "frequency_electrified",
-        "highspeed",
-        "maxspeed",
-        "voltage_electrified"
+        "{railway/light_rail}",
+        "highspeed"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index 03715bca0..ad51d03ec 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -1,13 +1,10 @@
 {
     "icon": "temaki-subway",
     "fields": [
-        "{railway/rail}"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered",
-        "frequency_electrified",
-        "maxspeed",
-        "voltage_electrified"
+        "{railway/light_rail}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
index fcfbe4173..a391c77cf 100644
--- a/data/presets/presets/railway/tram.json
+++ b/data/presets/presets/railway/tram.json
@@ -1,13 +1,10 @@
 {
     "icon": "temaki-tram",
     "fields": [
-        "{railway/rail}"
+        "{railway/light_rail}"
     ],
     "moreFields": [
-        "covered",
-        "frequency_electrified",
-        "maxspeed",
-        "voltage_electrified"
+        "{railway/light_rail}"
     ],
     "geometry": [
         "line"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1e545f5d1..084faf281 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3228,6 +3228,7 @@
                 },
                 "electrified": {
                     "label": "Electrification",
+                    "terms": "contact line,powered,third rail",
                     "placeholder": "Contact Line, Electrified Rail...",
                     "options": {
                         "contact_line": "Contact Line",