diff --git a/data/fields/railway/local_operated.json b/data/fields/railway/local_operated.json
new file mode 100644
index 00000000..c304ea35
--- /dev/null
+++ b/data/fields/railway/local_operated.json
@@ -0,0 +1,5 @@
+{
+    "key": "railway:local_operated",
+    "type": "check",
+    "label": "Locally Operated"
+}
diff --git a/data/fields/railway/ref.json b/data/fields/railway/ref.json
new file mode 100644
index 00000000..ae1ba3ec
--- /dev/null
+++ b/data/fields/railway/ref.json
@@ -0,0 +1,5 @@
+{
+    "key": "railway:ref",
+    "type": "text",
+    "label": "{ref}"
+}
diff --git a/data/fields/railway/signal/position.json b/data/fields/railway/signal/position.json
new file mode 100644
index 00000000..5c292552
--- /dev/null
+++ b/data/fields/railway/signal/position.json
@@ -0,0 +1,16 @@
+{
+    "key": "railway:signal:position",
+    "type": "combo",
+    "label": "Placement",
+    "strings": {
+        "options": {
+            "left": "Left",
+            "right": "Right",
+            "in_track": "In the track",
+            "bridge": "Overhead (attached to a gantry)",
+            "overhead": "Overhead (attached to the catenary wire)"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false
+}
diff --git a/data/fields/railway/turnout_side.json b/data/fields/railway/turnout_side.json
new file mode 100644
index 00000000..628eecdd
--- /dev/null
+++ b/data/fields/railway/turnout_side.json
@@ -0,0 +1,13 @@
+{
+    "key": "railway:turnout_side",
+    "type": "combo",
+    "label": "Turnout Side",
+    "strings": {
+        "options": {
+            "left": "Left",
+            "right": "Right"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": true
+}
diff --git a/data/presets/railway/light_rail.json b/data/presets/railway/light_rail.json
index 9d971b31..900e0e9c 100644
--- a/data/presets/railway/light_rail.json
+++ b/data/presets/railway/light_rail.json
@@ -7,7 +7,8 @@
         "gauge",
         "electrified",
         "service_rail",
-        "usage_rail"
+        "usage_rail",
+        "railway/track_ref"
     ],
     "moreFields": [
         "bridge/ref",
diff --git a/data/presets/railway/rail.json b/data/presets/railway/rail.json
index f51a6c0e..ed4b3fe5 100644
--- a/data/presets/railway/rail.json
+++ b/data/presets/railway/rail.json
@@ -1,8 +1,7 @@
 {
     "icon": "temaki-railway_track",
     "fields": [
-        "{railway/light_rail}",
-        "railway/track_ref"
+        "{railway/light_rail}"
     ],
     "moreFields": [
         "{railway/light_rail}",
diff --git a/data/presets/railway/signal.json b/data/presets/railway/signal.json
index 9266cd51..ef9e028f 100644
--- a/data/presets/railway/signal.json
+++ b/data/presets/railway/signal.json
@@ -7,6 +7,7 @@
     "fields": [
         "railway/position",
         "railway/signal/direction",
+        "railway/signal/position",
         "ref"
     ],
     "tags": {
diff --git a/data/presets/railway/switch.json b/data/presets/railway/switch.json
index 411b0e0c..96a64792 100644
--- a/data/presets/railway/switch.json
+++ b/data/presets/railway/switch.json
@@ -2,6 +2,8 @@
     "icon": "temaki-junction",
     "fields": [
         "railway/switch",
+        "railway/turnout_side",
+        "railway/local_operated",
         "ref"
     ],
     "geometry": [
diff --git a/data/presets/railway/yard.json b/data/presets/railway/yard.json
index 070a2902..d04dbb18 100644
--- a/data/presets/railway/yard.json
+++ b/data/presets/railway/yard.json
@@ -2,6 +2,7 @@
     "icon": "temaki-freight_car",
     "fields": [
         "name",
+        "railway/ref",
         "operator"
     ],
     "moreFields": [