diff --git a/data/fields/government.json b/data/fields/government.json
index 0133a83d..8559d3d5 100644
--- a/data/fields/government.json
+++ b/data/fields/government.json
@@ -1,5 +1,28 @@
 {
     "key": "government",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "administrative": "Administrative",
+            "public_service": "Public Service",
+            "tax": "Tax",
+            "register_office": "Register",
+            "legislative": "Legislative",
+            "transportation": "Transportation",
+            "ministry": "Ministry",
+            "healthcare": "Healthcare",
+            "prosecutor": "Prosecutor",
+            "social_services": "Social Services",
+            "education": "Education",
+            "social_security": "Social Security",
+            "customs": "Customs",
+            "environment": "Environment",
+            "cadaster": "Cadaster",
+            "culture": "Culture",
+            "statistics": "Statistics",
+            "audit": "Audit",
+            "parliament": "Parliament"
+        }
+    }
 }
diff --git a/data/fields/military.json b/data/fields/military.json
new file mode 100644
index 00000000..85eb39fd
--- /dev/null
+++ b/data/fields/military.json
@@ -0,0 +1,17 @@
+{
+    "key": "military",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "barracks": "Barracks",
+            "range": "Range",
+            "base": "Base",
+            "danger_area": "Danger Area",
+            "training_area": "Training Area",
+            "airfield": "Airfield",
+            "obstacle_course": "Obstacle Course"
+        }
+    },
+    "autoSuggestions": false
+}
diff --git a/data/fields/residential.json b/data/fields/residential.json
index 8de70a9f..eb1815a3 100644
--- a/data/fields/residential.json
+++ b/data/fields/residential.json
@@ -1,5 +1,22 @@
 {
     "key": "residential",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "rural": "Rural",
+            "apartments": "Apartments",
+            "single_family": "Single Family",
+            "urban": "Urban",
+            "condominium": "Condominium",
+            "trailer_park": "Trailer Park",
+            "irregular_settlement": "Irregular Settlement",
+            "detached": "Detached",
+            "terrace": "Terrace",
+            "university": "University",
+            "halting_site": "Halting Site",
+            "block": "Block",
+            "duplex": "Duplex"
+        }
+    }
 }
diff --git a/data/presets/landuse/military.json b/data/presets/landuse/military.json
index 6506218f..25d52b6b 100644
--- a/data/presets/landuse/military.json
+++ b/data/presets/landuse/military.json
@@ -1,7 +1,8 @@
 {
     "icon": "temaki-military",
     "fields": [
-        "name"
+        "name",
+        "military"
     ],
     "moreFields": [
         "{@templates/contact}",