diff --git a/data/presets/presets.json b/data/presets/presets.json
index 67be27321..e7c38dd56 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5349,10 +5349,10 @@
         "highway/cycleway": {
             "icon": "highway-cycleway",
             "fields": [
+                "oneway",
                 "surface",
                 "lit",
                 "width",
-                "oneway",
                 "structure",
                 "access"
             ],
@@ -5415,11 +5415,11 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
+                "structure",
                 "maxheight",
+                "access",
                 "cycleway"
             ],
             "geometry": [
@@ -5459,14 +5459,14 @@
         "highway/motorway_link": {
             "icon": "highway-motorway-link",
             "fields": [
+                "ref",
                 "oneway_yes",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
-                "ref"
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5492,15 +5492,15 @@
         "highway/motorway": {
             "icon": "highway-motorway",
             "fields": [
+                "ref",
                 "oneway_yes",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "toll",
-                "ref"
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5575,13 +5575,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5601,13 +5601,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5624,10 +5624,10 @@
                 "oneway",
                 "surface",
                 "sport_racing_motor",
-                "structure",
                 "lit",
                 "width",
-                "lanes"
+                "lanes",
+                "structure"
             ],
             "geometry": [
                 "point",
@@ -5657,12 +5657,12 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5693,11 +5693,11 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
-                "maxheight"
+                "maxheight",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5713,13 +5713,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5739,13 +5739,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5762,10 +5762,10 @@
                 "service",
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "surface",
-                "maxheight"
+                "maxheight",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -5991,13 +5991,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6017,13 +6017,13 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "ref",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6119,14 +6119,14 @@
         "highway/trunk_link": {
             "icon": "highway-trunk-link",
             "fields": [
+                "ref",
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
-                "ref"
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6144,15 +6144,15 @@
         "highway/trunk": {
             "icon": "highway-trunk",
             "fields": [
+                "ref",
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
                 "toll",
-                "ref"
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
@@ -6194,12 +6194,12 @@
             "fields": [
                 "oneway",
                 "maxspeed",
-                "structure",
-                "access",
                 "lanes",
                 "surface",
                 "maxheight",
-                "cycleway"
+                "cycleway",
+                "structure",
+                "access"
             ],
             "geometry": [
                 "line"
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index 345c084c5..03ce0bc46 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -1,10 +1,10 @@
 {
     "icon": "highway-cycleway",
     "fields": [
+        "oneway",
         "surface",
         "lit",
         "width",
-        "oneway",
         "structure",
         "access"
     ],
diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json
index 35bc46c84..962446eaf 100644
--- a/data/presets/presets/highway/living_street.json
+++ b/data/presets/presets/highway/living_street.json
@@ -3,11 +3,11 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
+        "structure",
         "maxheight",
+        "access",
         "cycleway"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index 6a86898a2..7a7983db1 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -1,15 +1,15 @@
 {
     "icon": "highway-motorway",
     "fields": [
+        "ref",
         "oneway_yes",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "toll",
-        "ref"
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json
index 4b9f57be1..1c3c42847 100644
--- a/data/presets/presets/highway/motorway_link.json
+++ b/data/presets/presets/highway/motorway_link.json
@@ -1,14 +1,14 @@
 {
     "icon": "highway-motorway-link",
     "fields": [
+        "ref",
         "oneway_yes",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
-        "ref"
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index 25cef6951..87f46b47b 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index 69851523c..46441c3ee 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/raceway.json b/data/presets/presets/highway/raceway.json
index c87f32253..d259408b1 100644
--- a/data/presets/presets/highway/raceway.json
+++ b/data/presets/presets/highway/raceway.json
@@ -4,10 +4,10 @@
         "oneway",
         "surface",
         "sport_racing_motor",
-        "structure",
         "lit",
         "width",
-        "lanes"
+        "lanes",
+        "structure"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index b268a7467..00fa3c400 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -3,12 +3,12 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json
index 54a07312f..408935e4e 100644
--- a/data/presets/presets/highway/road.json
+++ b/data/presets/presets/highway/road.json
@@ -3,11 +3,11 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
-        "maxheight"
+        "maxheight",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
index 32810f145..54d616bda 100644
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json
index 68e35b56a..12235b0cd 100644
--- a/data/presets/presets/highway/secondary_link.json
+++ b/data/presets/presets/highway/secondary_link.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 958c403d0..134172929 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -4,10 +4,10 @@
         "service",
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "surface",
-        "maxheight"
+        "maxheight",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
index cbd72aac6..6bcdafbcd 100644
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json
index 51d0c79e8..9ef4c96b1 100644
--- a/data/presets/presets/highway/tertiary_link.json
+++ b/data/presets/presets/highway/tertiary_link.json
@@ -3,13 +3,13 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "ref",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index a91724862..d1a473a0d 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -1,15 +1,15 @@
 {
     "icon": "highway-trunk",
     "fields": [
+        "ref",
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
         "toll",
-        "ref"
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json
index 251c832da..357be2d47 100644
--- a/data/presets/presets/highway/trunk_link.json
+++ b/data/presets/presets/highway/trunk_link.json
@@ -1,14 +1,14 @@
 {
     "icon": "highway-trunk-link",
     "fields": [
+        "ref",
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
-        "ref"
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json
index 91c06a5c5..e1dc75e2b 100644
--- a/data/presets/presets/highway/unclassified.json
+++ b/data/presets/presets/highway/unclassified.json
@@ -3,12 +3,12 @@
     "fields": [
         "oneway",
         "maxspeed",
-        "structure",
-        "access",
         "lanes",
         "surface",
         "maxheight",
-        "cycleway"
+        "cycleway",
+        "structure",
+        "access"
     ],
     "geometry": [
         "line"