diff --git a/data/presets/@templates/crossing/geometry_line.json b/data/presets/@templates/crossing/geometry_line.json
new file mode 100644
index 00000000..87890b8c
--- /dev/null
+++ b/data/presets/@templates/crossing/geometry_line.json
@@ -0,0 +1,25 @@
+{
+    "fields": [
+        "oneway",
+        "surface",
+        "smoothness",
+        "crossing_raised",
+        "access"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "crossing/geometry_line"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json
index 65330460..3caaf7d8 100644
--- a/data/presets/highway/crossing/traffic_signals.json
+++ b/data/presets/highway/crossing/traffic_signals.json
@@ -3,10 +3,10 @@
     "fields": [
         "{@templates/crossing/defaults}",
         "{@templates/crossing/markings}",
-        "crossing_raised",
         "button_operated",
         "traffic_signals/sound",
-        "traffic_signals/vibration"
+        "traffic_signals/vibration",
+        "crossing_raised"
     ],
     "moreFields": [
         "kerb",
diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
index 825e9b25..05d4c30f 100644
--- a/data/presets/highway/cycleway/_crossing.json
+++ b/data/presets/highway/cycleway/_crossing.json
@@ -2,9 +2,8 @@
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
index 1a1054f7..53e42d24 100644
--- a/data/presets/highway/cycleway/crossing/_marked.json
+++ b/data/presets/highway/cycleway/crossing/_marked.json
@@ -2,10 +2,8 @@
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
index 1904f44d..15b6ecb3 100644
--- a/data/presets/highway/cycleway/crossing/bicycle_foot.json
+++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -10,13 +10,9 @@
     },
     "icon": "temaki-ped_cyclist_crosswalk",
     "fields": [
-        "oneway",
         "{@templates/crossing/defaults}",
-        "surface",
-        "smoothness",
         "{@templates/crossing/markings}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
index a04bfeea..01325c92 100644
--- a/data/presets/highway/cycleway/crossing/traffic_signals.json
+++ b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -1,15 +1,12 @@
 {
     "icon": "fas-biking",
     "fields": [
-        "oneway",
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "crossing_raised",
         "button_operated",
         "traffic_signals/sound",
         "traffic_signals/vibration",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "moreFields": [
     ],
diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
index ebf26335..b48e7476 100644
--- a/data/presets/highway/cycleway/crossing/uncontrolled.json
+++ b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -1,12 +1,9 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
-        "oneway",
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings_yes}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
index 1f98202c..fe523975 100644
--- a/data/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -1,11 +1,8 @@
 {
     "icon": "fas-biking",
     "fields": [
-        "oneway",
         "{@templates/crossing/defaults}",
-        "surface",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json
index 1685344e..9054f4ea 100644
--- a/data/presets/highway/footway/crossing.json
+++ b/data/presets/highway/footway/crossing.json
@@ -1,10 +1,8 @@
 {
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
index 290faf2b..6de5d5bb 100644
--- a/data/presets/highway/footway/crossing/_marked.json
+++ b/data/presets/highway/footway/crossing/_marked.json
@@ -2,10 +2,8 @@
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
index 5694bbf7..f8ac8526 100644
--- a/data/presets/highway/footway/crossing/_zebra.json
+++ b/data/presets/highway/footway/crossing/_zebra.json
@@ -2,10 +2,8 @@
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
index 839b9700..6114cfa6 100644
--- a/data/presets/highway/footway/crossing/traffic_signals.json
+++ b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -2,13 +2,11 @@
     "icon": "temaki-railway_signals",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings}",
-        "crossing_raised",
         "button_operated",
         "traffic_signals/sound",
         "traffic_signals/vibration",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "moreFields": [
         "traffic_signals/arrow",
diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
index d10da93c..9a5150d6 100644
--- a/data/presets/highway/footway/crossing/uncontrolled.json
+++ b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -2,10 +2,8 @@
     "icon": "temaki-pedestrian",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
         "{@templates/crossing/markings_yes}",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json
index a4af0031..b2e01858 100644
--- a/data/presets/highway/footway/crossing/unmarked.json
+++ b/data/presets/highway/footway/crossing/unmarked.json
@@ -2,9 +2,7 @@
     "icon": "temaki-pedestrian",
     "fields": [
         "{@templates/crossing/defaults}",
-        "surface",
-        "crossing_raised",
-        "access"
+        "{@templates/crossing/geometry_line}"
     ],
     "moreFields": [
         "flashing_lights"