diff --git a/data/presets.yaml b/data/presets.yaml
index 4367c7291..119eb90de 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -759,6 +759,9 @@ en:
       height:
         # height=*
         label: Height (Meters)
+      highspeed:
+        # highspeed=*
+        label: Highspeed
       highway:
         # highway=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d99f88e66..10b7e4d8f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -143,6 +143,7 @@
     "healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"},
     "healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"},
     "height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"},
+    "highspeed": {"key": "highspeed", "type": "check", "label": "Highspeed"},
     "highway": {"key": "highway", "type": "typeCombo", "label": "Type"},
     "historic": {"key": "historic", "type": "typeCombo", "label": "Type"},
     "historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"},
diff --git a/data/presets/fields/highspeed.json b/data/presets/fields/highspeed.json
new file mode 100644
index 000000000..1865f09b9
--- /dev/null
+++ b/data/presets/fields/highspeed.json
@@ -0,0 +1,5 @@
+{
+    "key": "highspeed",
+    "type": "check",
+    "label": "Highspeed"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8fabcf81e..13a2c06c3 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -835,21 +835,21 @@
     "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"},
     "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": "iD-railway-disused", "fields": ["structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
-    "railway/funicular": {"icon": "iD-railway-rail", "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "fields": ["structure", "gauge", "service_rail"], "tags": {"railway": "funicular"}, "name": "Funicular"},
+    "railway/disused": {"icon": "iD-railway-disused", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
+    "railway/funicular": {"icon": "iD-railway-rail", "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/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": ["name", "structure", "gauge", "electrified", "service_rail", "usage_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": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "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": "iD-railway-rail", "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", "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": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_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": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "Rail"},
+    "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": "iD-railway-rail", "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": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": [], "name": "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"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
-    "railway/subway": {"icon": "temaki-subway", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["maxspeed", "voltage_electrified", "frequency_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
+    "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["frequency_electrified", "maxspeed", "voltage_electrified"], "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": ["name", "structure", "gauge", "electrified", "service_rail", "usage_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/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
     "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
     "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json
index ea611e50e..8d1c1517c 100644
--- a/data/presets/presets/railway/disused.json
+++ b/data/presets/presets/railway/disused.json
@@ -1,6 +1,7 @@
 {
     "icon": "iD-railway-disused",
     "fields": [
+        "operator",
         "structure",
         "service_rail",
         "usage_rail"
diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json
index b060b9d46..ee193b5e7 100644
--- a/data/presets/presets/railway/funicular.json
+++ b/data/presets/presets/railway/funicular.json
@@ -1,5 +1,15 @@
 {
     "icon": "iD-railway-rail",
+    "fields": [
+        "name",
+        "operator",
+        "structure",
+        "gauge",
+        "service_rail"
+    ],
+    "moreFields": [
+        "covered"
+    ],
     "geometry": [
         "line"
     ],
@@ -10,11 +20,6 @@
         "cable railway",
         "funicular railway"
     ],
-    "fields": [
-        "structure",
-        "gauge",
-        "service_rail"
-    ],
     "tags": {
         "railway": "funicular"
     },
diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json
index 0eb3ca157..e345eb28f 100644
--- a/data/presets/presets/railway/light_rail.json
+++ b/data/presets/presets/railway/light_rail.json
@@ -1,12 +1,7 @@
 {
     "icon": "temaki-light_rail",
     "fields": [
-        "name",
-        "structure",
-        "gauge",
-        "electrified",
-        "service_rail",
-        "usage_rail"
+        "{railway/rail}"
     ],
     "moreFields": [
         "covered",
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
index 52a06cfef..9d024e04d 100644
--- a/data/presets/presets/railway/monorail.json
+++ b/data/presets/presets/railway/monorail.json
@@ -2,6 +2,7 @@
     "icon": "temaki-monorail",
     "fields": [
         "name",
+        "operator",
         "structure",
         "electrified",
         "service_rail",
diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json
index e507f66bf..9ac8979d8 100644
--- a/data/presets/presets/railway/narrow_gauge.json
+++ b/data/presets/presets/railway/narrow_gauge.json
@@ -1,12 +1,7 @@
 {
     "icon": "iD-railway-rail",
     "fields": [
-        "name",
-        "structure",
-        "gauge",
-        "electrified",
-        "service_rail",
-        "usage_rail"
+        "{railway/rail}"
     ],
     "moreFields": [
         "covered",
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
index d15394a59..719999e89 100644
--- a/data/presets/presets/railway/rail.json
+++ b/data/presets/presets/railway/rail.json
@@ -2,6 +2,7 @@
     "icon": "iD-railway-rail",
     "fields": [
         "name",
+        "operator",
         "structure",
         "gauge",
         "electrified",
@@ -11,6 +12,7 @@
     "moreFields": [
         "covered",
         "frequency_electrified",
+        "highspeed",
         "maxspeed",
         "voltage_electrified"
     ],
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index f6325a58b..b22ce9f03 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -1,17 +1,12 @@
 {
     "icon": "temaki-subway",
     "fields": [
-        "name",
-        "structure",
-        "gauge",
-        "electrified",
-        "service_rail",
-        "usage_rail"
+        "{railway/rail}"
     ],
     "moreFields": [
+        "frequency_electrified",
         "maxspeed",
-        "voltage_electrified",
-        "frequency_electrified"
+        "voltage_electrified"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
index 94007c00e..fcfbe4173 100644
--- a/data/presets/presets/railway/tram.json
+++ b/data/presets/presets/railway/tram.json
@@ -1,12 +1,7 @@
 {
     "icon": "temaki-tram",
     "fields": [
-        "name",
-        "structure",
-        "gauge",
-        "electrified",
-        "service_rail",
-        "usage_rail"
+        "{railway/rail}"
     ],
     "moreFields": [
         "covered",
diff --git a/data/taginfo.json b/data/taginfo.json
index bf1686127..49d94c59f 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1281,6 +1281,7 @@
     {"key": "hashtags", "description": "🄵 Suggested Hashtags"},
     {"key": "healthcare:speciality", "description": "🄵 Specialties"},
     {"key": "height", "description": "🄵 Height (Meters)"},
+    {"key": "highspeed", "description": "🄵 Highspeed"},
     {"key": "historic:civilization", "description": "🄵 Historic Civilization"},
     {"key": "wreck:date_sunk", "description": "🄵 Date Sunk"},
     {"key": "wreck:visible_at_high_tide", "description": "🄵 Visible At High Tide"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 81597210e..02e04c464 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2777,6 +2777,9 @@
                 "height": {
                     "label": "Height (Meters)"
                 },
+                "highspeed": {
+                    "label": "Highspeed"
+                },
                 "highway": {
                     "label": "Type"
                 },