diff --git a/data/deprecated.json b/data/deprecated.json
index 39173c30a9..bf1c0162d9 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -20,6 +20,10 @@
       "old": {"amenity": "community_center"},
       "replace": {"amenity": "community_centre"}
     },
+    {
+      "old": {"amenity": "embassy"},
+      "replace": {"office": "diplomatic"}
+    },
     {
       "old": {"amenity": "ev_charging"},
       "replace": {"amenity": "charging_station"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 0cd38f0568..1e4857afdc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -358,6 +358,9 @@ en:
       construction:
         # construction=*
         label: Type
+      consulate:
+        # consulate=*
+        label: Type
       contact/webcam:
         # 'contact:webcam=*'
         label: Webcam URL
@@ -510,6 +513,12 @@ en:
       diet_multi:
         # 'diet:=*'
         label: Diet Types
+      diplomatic:
+        # diplomatic=*
+        label: Type
+      diplomatic/services:
+        # 'diplomatic:services:=*'
+        label: Services
       direction:
         # direction=*
         label: Direction (Degrees Clockwise)
@@ -632,6 +641,9 @@ en:
         label: Type
         # embankment field placeholder
         placeholder: Default
+      embassy:
+        # embassy=*
+        label: Type
       emergency:
         # emergency=*
         label: Emergency
@@ -1003,6 +1015,9 @@ en:
         label: Levels
         # levels field placeholder
         placeholder: '2, 4, 6...'
+      liaison:
+        # liaison=*
+        label: Type
       lit:
         # lit=*
         label: Lit
@@ -1938,6 +1953,9 @@ en:
           'yes': 'Yes'
         # takeaway field placeholder
         placeholder: 'Yes, No, Takeaway Only...'
+      target:
+        # target=*
+        label: Target
       tidal:
         # tidal=*
         label: Tidal
@@ -2517,7 +2535,6 @@ en:
       amenity/embassy:
         # amenity=embassy
         name: Embassy
-        terms: '<translate with synonyms or related terms for ''Embassy'', separated by commas>'
       amenity/fast_food:
         # amenity=fast_food
         name: Fast Food
@@ -5439,6 +5456,22 @@ en:
         name: Coworking Space
         # 'terms: coworking,office'
         terms: '<translate with synonyms or related terms for ''Coworking Space'', separated by commas>'
+      office/diplomatic:
+        # office=diplomatic
+        name: Diplomatic Office
+        terms: '<translate with synonyms or related terms for ''Diplomatic Office'', separated by commas>'
+      office/diplomatic/consulate:
+        # 'office=diplomatic, diplomatic=consulate'
+        name: Consulate
+        terms: '<translate with synonyms or related terms for ''Consulate'', separated by commas>'
+      office/diplomatic/embassy:
+        # 'office=diplomatic, diplomatic=embassy'
+        name: Embassy
+        terms: '<translate with synonyms or related terms for ''Embassy'', separated by commas>'
+      office/diplomatic/liaison:
+        # 'office=diplomatic, diplomatic=liaison'
+        name: Liaison Office
+        terms: '<translate with synonyms or related terms for ''Liaison Office'', separated by commas>'
       office/educational_institution:
         # office=educational_institution
         name: Educational Institution
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 2421fe36aa..5ee4c04270 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -64,6 +64,7 @@
     "comment": {"key": "comment", "type": "textarea", "label": "Changeset Comment", "placeholder": "Brief description of your contributions (required)"},
     "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
+    "consulate": {"key": "consulate", "type": "combo", "label": "Type"},
     "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
     "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
     "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
@@ -93,6 +94,8 @@
     "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
     "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]},
     "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types"},
+    "diplomatic": {"key": "diplomatic", "type": "combo", "label": "Type"},
+    "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"},
     "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}},
     "direction_clock": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"clockwise": "Clockwise", "anticlockwise": "Counterclockwise"}}},
     "direction_vertex": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
@@ -110,6 +113,7 @@
     "elevation": {"key": "ele", "type": "number", "icon": "elevation", "universal": true, "label": "Elevation"},
     "email": {"key": "email", "type": "email", "placeholder": "example@example.com", "label": "Email"},
     "embankment": {"key": "embankment", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
+    "embassy": {"key": "embassy", "type": "combo", "label": "Type"},
     "emergency": {"key": "emergency", "type": "check", "label": "Emergency"},
     "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"},
     "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
@@ -192,6 +196,7 @@
     "length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"},
     "level": {"key": "level", "type": "combo", "label": "Level", "universal": true},
     "levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
+    "liaison": {"key": "liaison", "type": "combo", "label": "Type"},
     "lit": {"key": "lit", "type": "check", "label": "Lit"},
     "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
     "location": {"key": "location", "type": "combo", "label": "Location"},
@@ -343,6 +348,7 @@
     "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
     "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
     "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}},
+    "target": {"key": "target", "type": "combo", "label": "Target"},
     "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
     "to": {"key": "to", "type": "text", "label": "To"},
     "toilets/disposal": {"key": "toilets:disposal", "type": "combo", "label": "Disposal", "strings": {"options": {"flush": "Flush", "pitlatrine": "Pit/Latrine", "chemical": "Chemical", "bucket": "Bucket"}}},
diff --git a/data/presets/fields/consulate.json b/data/presets/fields/consulate.json
new file mode 100644
index 0000000000..1610523dd7
--- /dev/null
+++ b/data/presets/fields/consulate.json
@@ -0,0 +1,5 @@
+{
+    "key": "consulate",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/diplomatic.json b/data/presets/fields/diplomatic.json
new file mode 100644
index 0000000000..e83a243bc4
--- /dev/null
+++ b/data/presets/fields/diplomatic.json
@@ -0,0 +1,5 @@
+{
+    "key": "diplomatic",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/diplomatic/services.json b/data/presets/fields/diplomatic/services.json
new file mode 100644
index 0000000000..9ca7161d1c
--- /dev/null
+++ b/data/presets/fields/diplomatic/services.json
@@ -0,0 +1,5 @@
+{
+    "key": "diplomatic:services:",
+    "type": "multiCombo",
+    "label": "Services"
+}
diff --git a/data/presets/fields/embassy.json b/data/presets/fields/embassy.json
new file mode 100644
index 0000000000..3fa14fa978
--- /dev/null
+++ b/data/presets/fields/embassy.json
@@ -0,0 +1,5 @@
+{
+    "key": "embassy",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/liaison.json b/data/presets/fields/liaison.json
new file mode 100644
index 0000000000..b9c0ea3ab6
--- /dev/null
+++ b/data/presets/fields/liaison.json
@@ -0,0 +1,5 @@
+{
+    "key": "liaison",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/target.json b/data/presets/fields/target.json
new file mode 100644
index 0000000000..a3975ea62e
--- /dev/null
+++ b/data/presets/fields/target.json
@@ -0,0 +1,5 @@
+{
+    "key": "target",
+    "type": "combo",
+    "label": "Target"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c57cd025bf..163b4528a4 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -45,6 +45,7 @@
     "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"},
     "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"},
     "amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false},
+    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "searchable": false, "name": "Embassy"},
     "amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "ferry_terminal"}, "matchScore": 0.95, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry"},
     "amenity/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nursing_home"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home", "searchable": false},
     "amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false},
@@ -93,7 +94,6 @@
     "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
     "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "wheelchair"], "moreFields": ["lit", "covered"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
     "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
-    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "name": "Embassy"},
     "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
     "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
     "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"},
@@ -722,6 +722,10 @@
     "office/charity": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "charity"}, "terms": ["charitable organization"], "name": "Charity Office"},
     "office/company": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "company"}, "terms": [], "name": "Corporate Office"},
     "office/coworking": {"icon": "maki-suitcase", "fields": ["{office}", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "terms": ["coworking", "office"], "tags": {"office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "name": "Coworking Space"},
+    "office/diplomatic": {"icon": "maki-embassy", "fields": ["name", "diplomatic", "country", "target", "diplomatic/services", "{office}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic"}, "terms": [], "name": "Diplomatic Office"},
+    "office/diplomatic/consulate": {"icon": "maki-embassy", "fields": ["name", "consulate", "{office/diplomatic}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic", "diplomatic": "consulate"}, "reference": {"key": "diplomatic", "value": "consulate"}, "terms": [], "name": "Consulate"},
+    "office/diplomatic/embassy": {"icon": "maki-embassy", "fields": ["name", "embassy", "{office/diplomatic}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic", "diplomatic": "embassy"}, "reference": {"key": "diplomatic", "value": "embassy"}, "terms": [], "name": "Embassy"},
+    "office/diplomatic/liaison": {"icon": "maki-embassy", "fields": ["name", "liaison", "{office/diplomatic}"], "geometry": ["point", "area"], "tags": {"office": "diplomatic", "diplomatic": "liaison"}, "reference": {"key": "diplomatic", "value": "liaison"}, "terms": [], "name": "Liaison Office"},
     "office/educational_institution": {"icon": "maki-school", "geometry": ["point", "area"], "tags": {"office": "educational_institution"}, "terms": [], "name": "Educational Institution"},
     "office/employment_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "employment_agency"}, "terms": ["job"], "name": "Employment Agency"},
     "office/energy_supplier": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "energy_supplier"}, "terms": ["electricity", "energy company", "energy utility", "gas utility"], "name": "Energy Supplier Office"},
diff --git a/data/presets/presets/amenity/embassy.json b/data/presets/presets/amenity/_embassy.json
similarity index 93%
rename from data/presets/presets/amenity/embassy.json
rename to data/presets/presets/amenity/_embassy.json
index 50da84ef29..74bdfa3f8d 100644
--- a/data/presets/presets/amenity/embassy.json
+++ b/data/presets/presets/amenity/_embassy.json
@@ -20,5 +20,6 @@
     "tags": {
         "amenity": "embassy"
     },
+    "searchable": false,
     "name": "Embassy"
 }
diff --git a/data/presets/presets/office/diplomatic.json b/data/presets/presets/office/diplomatic.json
new file mode 100644
index 0000000000..2f57b0ba1f
--- /dev/null
+++ b/data/presets/presets/office/diplomatic.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "diplomatic",
+        "country",
+        "target",
+        "diplomatic/services",
+        "{office}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic"
+    },
+    "terms": [],
+    "name": "Diplomatic Office"
+}
diff --git a/data/presets/presets/office/diplomatic/consulate.json b/data/presets/presets/office/diplomatic/consulate.json
new file mode 100644
index 0000000000..9038d52061
--- /dev/null
+++ b/data/presets/presets/office/diplomatic/consulate.json
@@ -0,0 +1,22 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "consulate",
+        "{office/diplomatic}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic",
+        "diplomatic": "consulate"
+    },
+    "reference": {
+        "key": "diplomatic",
+        "value": "consulate"
+    },
+    "terms": [],
+    "name": "Consulate"
+}
diff --git a/data/presets/presets/office/diplomatic/embassy.json b/data/presets/presets/office/diplomatic/embassy.json
new file mode 100644
index 0000000000..d505c988fc
--- /dev/null
+++ b/data/presets/presets/office/diplomatic/embassy.json
@@ -0,0 +1,22 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "embassy",
+        "{office/diplomatic}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic",
+        "diplomatic": "embassy"
+    },
+    "reference": {
+        "key": "diplomatic",
+        "value": "embassy"
+    },
+    "terms": [],
+    "name": "Embassy"
+}
diff --git a/data/presets/presets/office/diplomatic/liaison.json b/data/presets/presets/office/diplomatic/liaison.json
new file mode 100644
index 0000000000..77bea98f01
--- /dev/null
+++ b/data/presets/presets/office/diplomatic/liaison.json
@@ -0,0 +1,22 @@
+{
+    "icon": "maki-embassy",
+    "fields": [
+        "name",
+        "liaison",
+        "{office/diplomatic}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "diplomatic",
+        "diplomatic": "liaison"
+    },
+    "reference": {
+        "key": "diplomatic",
+        "value": "liaison"
+    },
+    "terms": [],
+    "name": "Liaison Office"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 4799f55efc..c65e8307b8 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -48,6 +48,7 @@
     {"key": "allotments", "value": "plot", "description": "🄿 Community Garden Plot", "object_types": ["area"]},
     {"key": "amenity", "value": "bus_station", "description": "🄿 Bus Station / Terminal (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"},
     {"key": "amenity", "value": "coworking_space", "description": "🄿 Coworking Space (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/commercial-15.svg?sanitize=true"},
+    {"key": "amenity", "value": "embassy", "description": "🄿 Embassy (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
     {"key": "amenity", "value": "ferry_terminal", "description": "🄿 Ferry Station / Terminal (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/ferry-15.svg?sanitize=true"},
     {"key": "amenity", "value": "nursing_home", "description": "🄿 Nursing Home (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"},
     {"key": "amenity", "value": "recycling", "description": "🄿 Recycling (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/recycling-15.svg?sanitize=true"},
@@ -95,7 +96,6 @@
     {"key": "amenity", "value": "dojo", "description": "🄿 Dojo / Martial Arts Academy", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
     {"key": "amenity", "value": "drinking_water", "description": "🄿 Drinking Water", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/drinking-water-15.svg?sanitize=true"},
     {"key": "amenity", "value": "driving_school", "description": "🄿 Driving School", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
-    {"key": "amenity", "value": "embassy", "description": "🄿 Embassy", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
     {"key": "amenity", "value": "fast_food", "description": "🄿 Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fast-food-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "burger", "description": "🄿 Burger Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fast-food-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "chicken", "description": "🄿 Chicken Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-drumstick-bite.svg?sanitize=true"},
@@ -696,6 +696,10 @@
     {"key": "office", "value": "charity", "description": "🄿 Charity Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "company", "description": "🄿 Corporate Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "coworking", "description": "🄿 Coworking Space", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
+    {"key": "office", "value": "diplomatic", "description": "🄿 Diplomatic Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
+    {"key": "diplomatic", "value": "consulate", "description": "🄿 Consulate", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
+    {"key": "diplomatic", "value": "embassy", "description": "🄿 Embassy", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
+    {"key": "diplomatic", "value": "liaison", "description": "🄿 Liaison Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/embassy-15.svg?sanitize=true"},
     {"key": "office", "value": "educational_institution", "description": "🄿 Educational Institution", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/school-15.svg?sanitize=true"},
     {"key": "office", "value": "employment_agency", "description": "🄿 Employment Agency", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
     {"key": "office", "value": "energy_supplier", "description": "🄿 Energy Supplier Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"},
@@ -1168,6 +1172,7 @@
     {"key": "comment", "description": "🄵 Changeset Comment"},
     {"key": "communication:", "description": "🄵 Communication Types"},
     {"key": "construction", "description": "🄵 Type"},
+    {"key": "consulate", "description": "🄵 Type"},
     {"key": "contact:webcam", "description": "🄵 Webcam URL"},
     {"key": "content", "description": "🄵 Content"},
     {"key": "conveying", "value": "forward", "description": "🄵 Movement Direction"},
@@ -1223,6 +1228,8 @@
     {"key": "devices", "description": "🄵 Devices"},
     {"key": "diaper", "description": "🄵 Diaper Changing Available"},
     {"key": "diet:", "description": "🄵 Diet Types"},
+    {"key": "diplomatic", "description": "🄵 Type"},
+    {"key": "diplomatic:services:", "description": "🄵 Services"},
     {"key": "direction", "value": "N", "description": "🄵 Direction"},
     {"key": "direction", "value": "E", "description": "🄵 Direction"},
     {"key": "direction", "value": "S", "description": "🄵 Direction"},
@@ -1262,6 +1269,7 @@
     {"key": "ele", "description": "🄵 Elevation"},
     {"key": "email", "description": "🄵 Email"},
     {"key": "embankment", "description": "🄵 Type, 🄵 Structure"},
+    {"key": "embassy", "description": "🄵 Type"},
     {"key": "emergency", "description": "🄵 Emergency"},
     {"key": "enforcement", "description": "🄵 Type"},
     {"key": "except", "description": "🄵 Exceptions"},
@@ -1350,6 +1358,7 @@
     {"key": "length", "description": "🄵 Length (Meters)"},
     {"key": "level", "description": "🄵 Level"},
     {"key": "building:levels", "description": "🄵 Levels"},
+    {"key": "liaison", "description": "🄵 Type"},
     {"key": "lit", "description": "🄵 Lit"},
     {"key": "location", "value": "outdoor", "description": "🄵 Location"},
     {"key": "location", "value": "indoor", "description": "🄵 Location"},
@@ -1573,6 +1582,7 @@
     {"key": "takeaway", "value": "yes", "description": "🄵 Takeaway"},
     {"key": "takeaway", "value": "no", "description": "🄵 Takeaway"},
     {"key": "takeaway", "value": "only", "description": "🄵 Takeaway"},
+    {"key": "target", "description": "🄵 Target"},
     {"key": "tidal", "description": "🄵 Tidal"},
     {"key": "to", "description": "🄵 To"},
     {"key": "toilets:disposal", "value": "flush", "description": "🄵 Disposal"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 62b0a0af53..afa923d66c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2497,6 +2497,9 @@
                 "construction": {
                     "label": "Type"
                 },
+                "consulate": {
+                    "label": "Type"
+                },
                 "contact/webcam": {
                     "label": "Webcam URL",
                     "placeholder": "http://example.com/"
@@ -2639,6 +2642,12 @@
                 "diet_multi": {
                     "label": "Diet Types"
                 },
+                "diplomatic": {
+                    "label": "Type"
+                },
+                "diplomatic/services": {
+                    "label": "Services"
+                },
                 "direction_cardinal": {
                     "label": "Direction",
                     "options": {
@@ -2733,6 +2742,9 @@
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "embassy": {
+                    "label": "Type"
+                },
                 "emergency": {
                     "label": "Emergency"
                 },
@@ -3061,6 +3073,9 @@
                     "label": "Levels",
                     "placeholder": "2, 4, 6..."
                 },
+                "liaison": {
+                    "label": "Type"
+                },
                 "lit": {
                     "label": "Lit"
                 },
@@ -3814,6 +3829,9 @@
                         "only": "Takeaway Only"
                     }
                 },
+                "target": {
+                    "label": "Target"
+                },
                 "tidal": {
                     "label": "Tidal"
                 },
@@ -4207,6 +4225,10 @@
                     "name": "Coworking Space",
                     "terms": ""
                 },
+                "amenity/embassy": {
+                    "name": "Embassy",
+                    "terms": ""
+                },
                 "amenity/ferry_terminal": {
                     "name": "Ferry Station / Terminal",
                     "terms": ""
@@ -4399,10 +4421,6 @@
                     "name": "Driving School",
                     "terms": ""
                 },
-                "amenity/embassy": {
-                    "name": "Embassy",
-                    "terms": ""
-                },
                 "amenity/fast_food": {
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
@@ -6915,6 +6933,22 @@
                     "name": "Coworking Space",
                     "terms": "coworking,office"
                 },
+                "office/diplomatic": {
+                    "name": "Diplomatic Office",
+                    "terms": ""
+                },
+                "office/diplomatic/consulate": {
+                    "name": "Consulate",
+                    "terms": ""
+                },
+                "office/diplomatic/embassy": {
+                    "name": "Embassy",
+                    "terms": ""
+                },
+                "office/diplomatic/liaison": {
+                    "name": "Liaison Office",
+                    "terms": ""
+                },
                 "office/educational_institution": {
                     "name": "Educational Institution",
                     "terms": ""