diff --git a/data/presets/@templates/crossing/geometry_way_more.json b/data/presets/@templates/crossing/geometry_way_more.json
new file mode 100644
index 00000000..28de4263
--- /dev/null
+++ b/data/presets/@templates/crossing/geometry_way_more.json
@@ -0,0 +1,22 @@
+{
+    "moreFields": [
+        "smoothness",
+        "lit"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/geometry_way_more"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
index 0af018bc..a15ee458 100644
--- a/data/presets/highway/cycleway/_crossing.json
+++ b/data/presets/highway/cycleway/_crossing.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
index 35ec954a..0ebea5fe 100644
--- a/data/presets/highway/cycleway/crossing/_marked.json
+++ b/data/presets/highway/cycleway/crossing/_marked.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
index e4421eb0..e4a6a6a6 100644
--- a/data/presets/highway/cycleway/crossing/bicycle_foot.json
+++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -16,7 +16,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
index 1989de6b..f40fd257 100644
--- a/data/presets/highway/cycleway/crossing/traffic_signals.json
+++ b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -9,7 +9,7 @@
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}",
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
index 6f1aa18b..5a8c7006 100644
--- a/data/presets/highway/cycleway/crossing/uncontrolled.json
+++ b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
index 6f7aa764..3d93b802 100644
--- a/data/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -6,7 +6,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}"
     ],
     "geometry": [
diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json
index b45c2f0d..78513071 100644
--- a/data/presets/highway/footway/crossing.json
+++ b/data/presets/highway/footway/crossing.json
@@ -6,7 +6,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "flashing_lights"
     ],
     "geometry": [
diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
index 0c1ccaae..599ee331 100644
--- a/data/presets/highway/footway/crossing/_marked.json
+++ b/data/presets/highway/footway/crossing/_marked.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "flashing_lights"
     ],
     "geometry": [
diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
index f0f284df..7ac1a29d 100644
--- a/data/presets/highway/footway/crossing/_zebra.json
+++ b/data/presets/highway/footway/crossing/_zebra.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "flashing_lights"
     ],
     "geometry": [
diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
index 5e8504ec..28807d16 100644
--- a/data/presets/highway/footway/crossing/traffic_signals.json
+++ b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -9,7 +9,7 @@
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}",
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "flashing_lights"
     ],
     "geometry": [
diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
index c38557ae..828bb345 100644
--- a/data/presets/highway/footway/crossing/uncontrolled.json
+++ b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "flashing_lights"
     ],
     "geometry": [
diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json
index b7a1a8ee..bf004627 100644
--- a/data/presets/highway/footway/crossing/unmarked.json
+++ b/data/presets/highway/footway/crossing/unmarked.json
@@ -6,7 +6,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "flashing_lights"
     ],
     "geometry": [
diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json
index 84573e12..a6e412fb 100644
--- a/data/presets/highway/path/_crossing.json
+++ b/data/presets/highway/path/_crossing.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json
index 72372f99..cb2d398e 100644
--- a/data/presets/highway/path/crossing/_marked.json
+++ b/data/presets/highway/path/crossing/_marked.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json
index 514db5ee..4ff6d51f 100644
--- a/data/presets/highway/path/crossing/_traffic_signals.json
+++ b/data/presets/highway/path/crossing/_traffic_signals.json
@@ -9,7 +9,7 @@
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}",
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json
index e8da6fd3..3dc03f42 100644
--- a/data/presets/highway/path/crossing/_uncontrolled.json
+++ b/data/presets/highway/path/crossing/_uncontrolled.json
@@ -7,7 +7,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],
diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json
index 88c8477a..f904a086 100644
--- a/data/presets/highway/path/crossing/_unmarked.json
+++ b/data/presets/highway/path/crossing/_unmarked.json
@@ -6,7 +6,7 @@
         "surface"
     ],
     "moreFields": [
-        "smoothness",
+        "{@templates/crossing/geometry_way_more}",
         "{@templates/crossing/bicycle_more}",
         "flashing_lights"
     ],