diff --git a/data/presets/@templates/crossing/geometry_line.json b/data/presets/@templates/crossing/bicycle_relevance.json
similarity index 68%
rename from data/presets/@templates/crossing/geometry_line.json
rename to data/presets/@templates/crossing/bicycle_relevance.json
index 87890b8c..8e193d4d 100644
--- a/data/presets/@templates/crossing/geometry_line.json
+++ b/data/presets/@templates/crossing/bicycle_relevance.json
@@ -1,16 +1,13 @@
 {
     "fields": [
         "oneway",
-        "surface",
-        "smoothness",
-        "crossing_raised",
         "access"
     ],
     "geometry": [
-        "point"
+        "line"
     ],
     "tags": {
-        "@template": "crossing/geometry_line"
+        "@template": "crossing/bicycle_relevance"
     },
     "searchable": false,
     "locationSet": {
diff --git a/data/presets/@templates/crossing/defaults.json b/data/presets/@templates/crossing/defaults.json
index e1701a20..64c4a2e1 100644
--- a/data/presets/@templates/crossing/defaults.json
+++ b/data/presets/@templates/crossing/defaults.json
@@ -1,8 +1,8 @@
 {
     "fields": [
-        "crossing",
+        "crossing/island",
         "tactile_paving",
-        "crossing/island"
+        "crossing_raised"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/@templates/crossing/surfacequality.json b/data/presets/@templates/crossing/surfacequality.json
new file mode 100644
index 00000000..ab10d7cf
--- /dev/null
+++ b/data/presets/@templates/crossing/surfacequality.json
@@ -0,0 +1,22 @@
+{
+    "fields": [
+        "surface",
+        "smoothness"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "@template": "crossing/surfacequality"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json
index 94415e72..b2b99ea5 100644
--- a/data/presets/highway/crossing.json
+++ b/data/presets/highway/crossing.json
@@ -1,8 +1,7 @@
 {
     "fields": [
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/markings}",
-        "crossing_raised"
+        "{@templates/crossing/markings}"
     ],
     "moreFields": [
         "flashing_lights",
diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json
index 3452a16b..d75d0263 100644
--- a/data/presets/highway/crossing/_marked.json
+++ b/data/presets/highway/crossing/_marked.json
@@ -3,7 +3,6 @@
     "fields": [
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "crossing_raised"
     ],
     "moreFields": [
         "kerb"
diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
index fcec2f9b..800ed2c8 100644
--- a/data/presets/highway/crossing/_zebra.json
+++ b/data/presets/highway/crossing/_zebra.json
@@ -3,7 +3,6 @@
     "fields": [
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "crossing_raised"
     ],
     "moreFields": [
         "kerb"
diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json
index 0f7f8ace..c50f6c33 100644
--- a/data/presets/highway/crossing/traffic_signals.json
+++ b/data/presets/highway/crossing/traffic_signals.json
@@ -1,10 +1,9 @@
 {
     "icon": "temaki-railway_signals",
     "fields": [
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "crossing_raised"
     ],
     "moreFields": [
         "kerb",
diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json
index 5582d433..e350fe1f 100644
--- a/data/presets/highway/crossing/uncontrolled.json
+++ b/data/presets/highway/crossing/uncontrolled.json
@@ -1,9 +1,8 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
-        "{@templates/crossing/defaults}",
         "{@templates/crossing/markings_yes}",
-        "crossing_raised"
+        "{@templates/crossing/defaults}"
     ],
     "moreFields": [
         "kerb"
diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
index d3eb170b..65410c6b 100644
--- a/data/presets/highway/crossing/unmarked.json
+++ b/data/presets/highway/crossing/unmarked.json
@@ -1,8 +1,7 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "{@templates/crossing/defaults}",
-        "crossing_raised"
+        "{@templates/crossing/defaults}"
     ],
     "moreFields": [
         "kerb"
diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
index 2e394c85..9c51821c 100644
--- a/data/presets/highway/cycleway/_crossing.json
+++ b/data/presets/highway/cycleway/_crossing.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
index 41f43fe8..b3076003 100644
--- a/data/presets/highway/cycleway/crossing/_marked.json
+++ b/data/presets/highway/cycleway/crossing/_marked.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
index e774e60b..0a708e23 100644
--- a/data/presets/highway/cycleway/crossing/bicycle_foot.json
+++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -10,9 +10,10 @@
     },
     "icon": "temaki-ped_cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
index b0b3e9ff..4a52ea6e 100644
--- a/data/presets/highway/cycleway/crossing/traffic_signals.json
+++ b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -1,10 +1,11 @@
 {
     "icon": "fas-biking",
     "fields": [
+        "crossing",
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}"
diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json
index b48e7476..ecec949f 100644
--- a/data/presets/highway/cycleway/crossing/uncontrolled.json
+++ b/data/presets/highway/cycleway/crossing/uncontrolled.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
index fe523975..1a5edb74 100644
--- a/data/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -1,8 +1,9 @@
 {
     "icon": "fas-biking",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json
index 5d82b511..758f272d 100644
--- a/data/presets/highway/footway/crossing.json
+++ b/data/presets/highway/footway/crossing.json
@@ -1,8 +1,9 @@
 {
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
index 5312133e..e6070d6f 100644
--- a/data/presets/highway/footway/crossing/_marked.json
+++ b/data/presets/highway/footway/crossing/_marked.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json
index 9e121bb0..86cf614a 100644
--- a/data/presets/highway/footway/crossing/_zebra.json
+++ b/data/presets/highway/footway/crossing/_zebra.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json
index 32d9e880..24322579 100644
--- a/data/presets/highway/footway/crossing/traffic_signals.json
+++ b/data/presets/highway/footway/crossing/traffic_signals.json
@@ -1,10 +1,11 @@
 {
     "icon": "temaki-railway_signals",
     "fields": [
+        "crossing",
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}"
diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json
index 9a5150d6..7d5635c9 100644
--- a/data/presets/highway/footway/crossing/uncontrolled.json
+++ b/data/presets/highway/footway/crossing/uncontrolled.json
@@ -1,9 +1,10 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "{@templates/crossing/defaults}",
+        "crossing",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/defaults}",
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json
index b2e01858..c641a079 100644
--- a/data/presets/highway/footway/crossing/unmarked.json
+++ b/data/presets/highway/footway/crossing/unmarked.json
@@ -1,8 +1,9 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json
index d8997267..62228096 100644
--- a/data/presets/highway/path/_crossing.json
+++ b/data/presets/highway/path/_crossing.json
@@ -1,9 +1,11 @@
 {
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json
index 4a029c65..c0b9ec94 100644
--- a/data/presets/highway/path/crossing/_marked.json
+++ b/data/presets/highway/path/crossing/_marked.json
@@ -1,9 +1,11 @@
 {
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
+        "crossing",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json
index 73c8fed6..bba994e5 100644
--- a/data/presets/highway/path/crossing/_traffic_signals.json
+++ b/data/presets/highway/path/crossing/_traffic_signals.json
@@ -1,10 +1,12 @@
 {
     "icon": "temaki-railway_signals",
     "fields": [
+        "crossing",
+        "{@templates/crossing/traffic_signal}",
         "{@templates/crossing/markings}",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/traffic_signal}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "{@templates/crossing/traffic_signal_more}"
diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json
index 69bd33f5..1618feda 100644
--- a/data/presets/highway/path/crossing/_uncontrolled.json
+++ b/data/presets/highway/path/crossing/_uncontrolled.json
@@ -1,9 +1,11 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "{@templates/crossing/defaults}",
+        "crossing",
         "{@templates/crossing/markings_yes}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/defaults}",
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "flashing_lights"
diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json
index 516d1ee6..565112a8 100644
--- a/data/presets/highway/path/crossing/_unmarked.json
+++ b/data/presets/highway/path/crossing/_unmarked.json
@@ -1,8 +1,10 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
+        "crossing",
         "{@templates/crossing/defaults}",
-        "{@templates/crossing/geometry_line}"
+        "{@templates/crossing/surfacequality}",
+        "{@templates/crossing/bicycle_relevance}"
     ],
     "moreFields": [
         "flashing_lights"