diff --git a/data/presets.yaml b/data/presets.yaml
index 5faeeda95..e39e89739 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -380,14 +380,6 @@ en:
         label: Type
       religion:
         label: Religion
-        options:
-          christian: Christian
-          muslim: Muslim
-          buddhist: Buddhist
-          jewish: Jewish
-          hindu: Hindu
-          shinto: Shinto
-          taoist: Taoist
       restriction:
         label: Type
       restrictions:
@@ -410,24 +402,10 @@ en:
         label: Seasonal
       service:
         label: Type
-        options:
-          parking_aisle: Parking Aisle
-          driveway: Driveway
-          alley: Alley
-          emergency_access: Emergency Access
-          drive-through: Drive-through
       shelter:
         label: Shelter
       shelter_type:
         label: Type
-        options:
-          public_transport: Public Transport
-          picnic_shelter: Picnic Shelter
-          weather_shelter: Weather Shelter
-          lean_to: Lean-to
-          basic_hut: Basic Hut
-          field_shelter: Field Shelter
-          rock_shelter: Rock Shelter
       shop:
         label: Type
       sloped_curb:
@@ -463,12 +441,6 @@ en:
         label: Sport
       sport_ice:
         label: Sport
-        options:
-          skating: Ice Skating
-          hockey: Ice Hockey
-          multi: Multi
-          curling: Curling
-          ice_stock: Ice Stock
       structure:
         label: Structure
         placeholder: Unknown
@@ -480,9 +452,6 @@ en:
           ford: Ford
       studio_type:
         label: Type
-        options:
-          audio: Audio
-          video: Video
       supervised:
         label: Supervised
       surface:
@@ -521,10 +490,6 @@ en:
           "no": "No: pathless, excellent orientation skills required"
       tree_type:
         label: Type
-        options:
-          broad_leaved: Broad Leaved
-          conifer: Conifer
-          palm: Palm
       trees:
         label: Trees
       tunnel:
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 8a5ff8824..cf554ae8d 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -771,18 +771,7 @@
     "religion": {
         "key": "religion",
         "type": "combo",
-        "label": "Religion",
-        "strings": {
-            "options": {
-                "christian": "Christian",
-                "muslim": "Muslim",
-                "buddhist": "Buddhist",
-                "jewish": "Jewish",
-                "hindu": "Hindu",
-                "shinto": "Shinto",
-                "taoist": "Taoist"
-            }
-        }
+        "label": "Religion"
     },
     "restriction": {
         "key": "restriction",
@@ -833,15 +822,13 @@
         "key": "service",
         "type": "combo",
         "label": "Type",
-        "strings": {
-            "options": {
-                "parking_aisle": "Parking Aisle",
-                "driveway": "Driveway",
-                "alley": "Alley",
-                "emergency_access": "Emergency Access",
-                "drive-through": "Drive-through"
-            }
-        }
+        "options": [
+            "parking_aisle",
+            "driveway",
+            "alley",
+            "emergency_access",
+            "drive-through"
+        ]
     },
     "shelter": {
         "key": "shelter",
@@ -851,18 +838,7 @@
     "shelter_type": {
         "key": "shelter_type",
         "type": "combo",
-        "label": "Type",
-        "strings": {
-            "options": {
-                "public_transport": "Public Transport",
-                "picnic_shelter": "Picnic Shelter",
-                "weather_shelter": "Weather Shelter",
-                "lean_to": "Lean-to",
-                "basic_hut": "Basic Hut",
-                "field_shelter": "Field Shelter",
-                "rock_shelter": "Rock Shelter"
-            }
-        }
+        "label": "Type"
     },
     "shop": {
         "key": "shop",
@@ -946,15 +922,13 @@
         "key": "sport",
         "type": "combo",
         "label": "Sport",
-        "strings": {
-            "options": {
-                "skating": "Ice Skating",
-                "hockey": "Ice Hockey",
-                "multi": "Multi",
-                "curling": "Curling",
-                "ice_stock": "Ice Stock"
-            }
-        }
+        "options": [
+            "skating",
+            "hockey",
+            "multi",
+            "curling",
+            "ice_stock"
+        ]
     },
     "structure": {
         "type": "radio",
@@ -981,12 +955,10 @@
         "key": "type",
         "type": "combo",
         "label": "Type",
-        "strings": {
-            "options": {
-                "audio": "Audio",
-                "video": "Video"
-            }
-        }
+        "options": [
+            "audio",
+            "video"
+        ]
     },
     "supervised": {
         "key": "supervised",
@@ -1061,13 +1033,11 @@
         "key": "type",
         "type": "combo",
         "label": "Type",
-        "strings": {
-            "options": {
-                "broad_leaved": "Broad Leaved",
-                "conifer": "Conifer",
-                "palm": "Palm"
-            }
-        }
+        "options": [
+            "broad_leaved",
+            "conifer",
+            "palm"
+        ]
     },
     "trees": {
         "key": "trees",
diff --git a/data/presets/fields/religion.json b/data/presets/fields/religion.json
index 79adf17b6..36b5b67c6 100644
--- a/data/presets/fields/religion.json
+++ b/data/presets/fields/religion.json
@@ -1,16 +1,5 @@
 {
     "key": "religion",
     "type": "combo",
-    "label": "Religion",
-    "strings": {
-        "options": {
-            "christian": "Christian",
-            "muslim": "Muslim",
-            "buddhist": "Buddhist",
-            "jewish": "Jewish",
-            "hindu": "Hindu",
-            "shinto": "Shinto",
-            "taoist": "Taoist"
-        }
-    }
+    "label": "Religion"
 }
diff --git a/data/presets/fields/service.json b/data/presets/fields/service.json
index 6b5a82833..5686b0a6e 100644
--- a/data/presets/fields/service.json
+++ b/data/presets/fields/service.json
@@ -2,13 +2,11 @@
     "key": "service",
     "type": "combo",
     "label": "Type",
-    "strings": {
-        "options": {
-            "parking_aisle": "Parking Aisle",
-            "driveway": "Driveway",
-            "alley": "Alley",
-            "emergency_access": "Emergency Access",
-            "drive-through": "Drive-through"
-        }
-    }
+    "options": [
+        "parking_aisle",
+        "driveway",
+        "alley",
+        "emergency_access",
+        "drive-through"
+    ]
 }
diff --git a/data/presets/fields/shelter_type.json b/data/presets/fields/shelter_type.json
index 464985854..2ea69ac6b 100644
--- a/data/presets/fields/shelter_type.json
+++ b/data/presets/fields/shelter_type.json
@@ -1,17 +1,5 @@
 {
     "key": "shelter_type",
     "type": "combo",
-    "label": "Type",
-    "strings": {
-        "options": {
-            "public_transport": "Public Transport",
-            "picnic_shelter": "Picnic Shelter",
-            "weather_shelter": "Weather Shelter",
-            "lean_to": "Lean-to",
-            "basic_hut": "Basic Hut",
-            "field_shelter": "Field Shelter",
-            "rock_shelter": "Rock Shelter"
-        }
-    }
-
+    "label": "Type"
 }
diff --git a/data/presets/fields/sport_ice.json b/data/presets/fields/sport_ice.json
index bbc12be97..7e5133bf9 100644
--- a/data/presets/fields/sport_ice.json
+++ b/data/presets/fields/sport_ice.json
@@ -2,14 +2,11 @@
     "key": "sport",
     "type": "combo",
     "label": "Sport",
-    "strings": {
-        "options": {
-            "skating": "Ice Skating",
-            "hockey": "Ice Hockey",
-            "multi": "Multi",
-            "curling": "Curling",
-            "ice_stock": "Ice Stock"
-        }
-    }
-
+    "options": [
+        "skating",
+        "hockey",
+        "multi",
+        "curling",
+        "ice_stock"
+    ]
 }
diff --git a/data/presets/fields/studio_type.json b/data/presets/fields/studio_type.json
index c07699949..8d452be7a 100644
--- a/data/presets/fields/studio_type.json
+++ b/data/presets/fields/studio_type.json
@@ -2,10 +2,8 @@
     "key": "type",
     "type": "combo",
     "label": "Type",
-    "strings": {
-        "options": {
-            "audio": "Audio",
-            "video": "Video"
-        }
-    }
+    "options": [
+        "audio",
+        "video"
+    ]
 }
diff --git a/data/presets/fields/tree_type.json b/data/presets/fields/tree_type.json
index 028537ebe..54faa3793 100644
--- a/data/presets/fields/tree_type.json
+++ b/data/presets/fields/tree_type.json
@@ -2,11 +2,9 @@
     "key": "type",
     "type": "combo",
     "label": "Type",
-    "strings": {
-        "options": {
-            "broad_leaved": "Broad Leaved",
-            "conifer": "Conifer",
-            "palm": "Palm"
-        }
-    }
+    "options": [
+        "broad_leaved",
+        "conifer",
+        "palm"
+    ]
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a11874e00..ab3ac13d2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -935,16 +935,7 @@
                 "label": "Type"
             },
             "religion": {
-                "label": "Religion",
-                "options": {
-                    "christian": "Christian",
-                    "muslim": "Muslim",
-                    "buddhist": "Buddhist",
-                    "jewish": "Jewish",
-                    "hindu": "Hindu",
-                    "shinto": "Shinto",
-                    "taoist": "Taoist"
-                }
+                "label": "Religion"
             },
             "restriction": {
                 "label": "Type"
@@ -974,29 +965,13 @@
                 "label": "Seasonal"
             },
             "service": {
-                "label": "Type",
-                "options": {
-                    "parking_aisle": "Parking Aisle",
-                    "driveway": "Driveway",
-                    "alley": "Alley",
-                    "emergency_access": "Emergency Access",
-                    "drive-through": "Drive-through"
-                }
+                "label": "Type"
             },
             "shelter": {
                 "label": "Shelter"
             },
             "shelter_type": {
-                "label": "Type",
-                "options": {
-                    "public_transport": "Public Transport",
-                    "picnic_shelter": "Picnic Shelter",
-                    "weather_shelter": "Weather Shelter",
-                    "lean_to": "Lean-to",
-                    "basic_hut": "Basic Hut",
-                    "field_shelter": "Field Shelter",
-                    "rock_shelter": "Rock Shelter"
-                }
+                "label": "Type"
             },
             "shop": {
                 "label": "Type"
@@ -1041,14 +1016,7 @@
                 "label": "Sport"
             },
             "sport_ice": {
-                "label": "Sport",
-                "options": {
-                    "skating": "Ice Skating",
-                    "hockey": "Ice Hockey",
-                    "multi": "Multi",
-                    "curling": "Curling",
-                    "ice_stock": "Ice Stock"
-                }
+                "label": "Sport"
             },
             "structure": {
                 "label": "Structure",
@@ -1062,11 +1030,7 @@
                 }
             },
             "studio_type": {
-                "label": "Type",
-                "options": {
-                    "audio": "Audio",
-                    "video": "Video"
-                }
+                "label": "Type"
             },
             "supervised": {
                 "label": "Supervised"
@@ -1116,12 +1080,7 @@
                 }
             },
             "tree_type": {
-                "label": "Type",
-                "options": {
-                    "broad_leaved": "Broad Leaved",
-                    "conifer": "Conifer",
-                    "palm": "Palm"
-                }
+                "label": "Type"
             },
             "trees": {
                 "label": "Trees"