diff --git a/data/fields/crossing/markings-BG.json b/data/fields/crossing/markings-BG.json
index 1188ab3b..5c186e07 100644
--- a/data/fields/crossing/markings-BG.json
+++ b/data/fields/crossing/markings-BG.json
@@ -2,6 +2,7 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
     "stringsCrossReference": "{crossing/markings}",
     "iconsCrossReference": "{crossing/markings}",
     "options": [
@@ -15,6 +16,5 @@
         "include": [
             "BG"
         ]
-    },
-    "autoSuggestions": false
+    }
 }
diff --git a/data/fields/crossing/markings-DE-AT-CH.json b/data/fields/crossing/markings-DE-AT-CH.json
index 5268a818..c758a852 100644
--- a/data/fields/crossing/markings-DE-AT-CH.json
+++ b/data/fields/crossing/markings-DE-AT-CH.json
@@ -2,6 +2,9 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "yes",
@@ -10,9 +13,6 @@
         "dashes",
         "surface"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "DE",
diff --git a/data/fields/crossing/markings-PL.json b/data/fields/crossing/markings-PL.json
index c33df49f..edc86d25 100644
--- a/data/fields/crossing/markings-PL.json
+++ b/data/fields/crossing/markings-PL.json
@@ -2,6 +2,9 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "dots",
@@ -9,9 +12,6 @@
         "yes",
         "no"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "PL"
diff --git a/data/fields/crossing/markings_yes-BG.json b/data/fields/crossing/markings_yes-BG.json
index 8b81bb2c..9155115d 100644
--- a/data/fields/crossing/markings_yes-BG.json
+++ b/data/fields/crossing/markings_yes-BG.json
@@ -2,9 +2,10 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
     "stringsCrossReference": "{crossing/markings}",
     "iconsCrossReference": "{crossing/markings}",
-    "default": "yes",
     "options": [
         "zebra",
         "no",
@@ -16,6 +17,5 @@
         "include": [
             "BG"
         ]
-    },
-    "autoSuggestions": false
+    }
 }
diff --git a/data/fields/crossing/markings_yes-DE-AT-CH.json b/data/fields/crossing/markings_yes-DE-AT-CH.json
index eee9c475..04524b36 100644
--- a/data/fields/crossing/markings_yes-DE-AT-CH.json
+++ b/data/fields/crossing/markings_yes-DE-AT-CH.json
@@ -2,6 +2,10 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "yes",
@@ -10,15 +14,11 @@
         "dashes",
         "surface"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "DE",
             "AT",
             "CH"
         ]
-    },
-    "default": "yes"
+    }
 }
diff --git a/data/fields/crossing/markings_yes-PL.json b/data/fields/crossing/markings_yes-PL.json
index 71358b53..c10103b0 100644
--- a/data/fields/crossing/markings_yes-PL.json
+++ b/data/fields/crossing/markings_yes-PL.json
@@ -2,6 +2,10 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "autoSuggestions": false,
+    "default": "yes",
+    "stringsCrossReference": "{crossing/markings}",
+    "iconsCrossReference": "{crossing/markings}",
     "options": [
         "zebra",
         "dots",
@@ -9,13 +13,9 @@
         "yes",
         "no"
     ],
-    "autoSuggestions": false,
-    "iconsCrossReference": "{crossing/markings}",
-    "stringsCrossReference": "{crossing/markings}",
     "locationSet": {
         "include": [
             "PL"
         ]
-    },
-    "default": "yes"
+    }
 }
diff --git a/data/fields/crossing/markings_yes.json b/data/fields/crossing/markings_yes.json
index c088572f..c0203f6a 100644
--- a/data/fields/crossing/markings_yes.json
+++ b/data/fields/crossing/markings_yes.json
@@ -2,9 +2,9 @@
     "key": "crossing:markings",
     "type": "combo",
     "label": "{crossing/markings}",
+    "default": "yes",
     "stringsCrossReference": "{crossing/markings}",
     "iconsCrossReference": "{crossing/markings}",
-    "default": "yes",
     "locationSet": {
         "exclude": [
             "BG",