diff --git a/data/presets.yaml b/data/presets.yaml
index d873c1eaa..0a51763e5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4012,10 +4012,29 @@ en:
         # office=administrative
         name: Administrative Office
         terms: '<translate with synonyms or related terms for ''Administrative Office'', separated by commas>'
+      office/adoption_agency:
+        # office=adoption_agency
+        name: Adoption Agency
+        terms: '<translate with synonyms or related terms for ''Adoption Agency'', separated by commas>'
+      office/advertising_agency:
+        # office=advertising_agency
+        name: Advertising Agency
+        # 'terms: ad,ad agency,advert agency,advertising,marketing'
+        terms: '<translate with synonyms or related terms for ''Advertising Agency'', separated by commas>'
       office/architect:
         # office=architect
         name: Architect
         terms: '<translate with synonyms or related terms for ''Architect'', separated by commas>'
+      office/association:
+        # office=association
+        name: Nonprofit Organization Office
+        # 'terms: association,non-profit,nonprofit,organization,society'
+        terms: '<translate with synonyms or related terms for ''Nonprofit Organization Office'', separated by commas>'
+      office/charity:
+        # office=charity
+        name: Charity Office
+        # 'terms: charitable organization'
+        terms: '<translate with synonyms or related terms for ''Charity Office'', separated by commas>'
       office/company:
         # office=company
         name: Company Office
@@ -4034,6 +4053,11 @@ en:
         name: Employment Agency
         # 'terms: job'
         terms: '<translate with synonyms or related terms for ''Employment Agency'', separated by commas>'
+      office/energy_supplier:
+        # office=energy_supplier
+        name: Energy Supplier Office
+        # 'terms: electricity,energy company,energy utility,gas utility'
+        terms: '<translate with synonyms or related terms for ''Energy Supplier Office'', separated by commas>'
       office/estate_agent:
         # office=estate_agent
         name: Real Estate Office
@@ -4042,6 +4066,15 @@ en:
         # office=financial
         name: Financial Office
         terms: '<translate with synonyms or related terms for ''Financial Office'', separated by commas>'
+      office/forestry:
+        # office=forestry
+        name: Forestry Office
+        # 'terms: forest'
+        terms: '<translate with synonyms or related terms for ''Forestry Office'', separated by commas>'
+      office/foundation:
+        # office=foundation
+        name: Foundation Office
+        terms: '<translate with synonyms or related terms for ''Foundation Office'', separated by commas>'
       office/government:
         # office=government
         name: Government Office
@@ -4051,6 +4084,16 @@ en:
         name: Register Office
         # 'terms: clerk,marriage,death,birth,certificate'
         terms: '<translate with synonyms or related terms for ''Register Office'', separated by commas>'
+      office/government/tax:
+        # 'office=government, government=tax'
+        name: Tax and Revenue Office
+        # 'terms: fiscal authorities,revenue office,tax office'
+        terms: '<translate with synonyms or related terms for ''Tax and Revenue Office'', separated by commas>'
+      office/guide:
+        # office=guide
+        name: Guide Office
+        # 'terms: dive guide,mountain guide,tour guide'
+        terms: '<translate with synonyms or related terms for ''Guide Office'', separated by commas>'
       office/insurance:
         # office=insurance
         name: Insurance Office
@@ -4068,6 +4111,11 @@ en:
         name: Notary Office
         # 'terms: clerk,signature,wills,deeds,estate'
         terms: '<translate with synonyms or related terms for ''Notary Office'', separated by commas>'
+      office/moving_company:
+        # office=moving_company
+        name: Moving Company Office
+        # 'terms: relocation'
+        terms: '<translate with synonyms or related terms for ''Moving Company Office'', separated by commas>'
       office/newspaper:
         # office=newspaper
         name: Newspaper
@@ -4076,6 +4124,10 @@ en:
         # office=ngo
         name: NGO Office
         terms: '<translate with synonyms or related terms for ''NGO Office'', separated by commas>'
+      office/notary:
+        # office=notary
+        name: Notary Office
+        terms: '<translate with synonyms or related terms for ''Notary Office'', separated by commas>'
       office/physician:
         # office=physician
         name: Physician
@@ -4083,10 +4135,29 @@ en:
         # office=political_party
         name: Political Party
         terms: '<translate with synonyms or related terms for ''Political Party'', separated by commas>'
+      office/private_investigator:
+        # office=private_investigator
+        name: Private Investigator Office
+        # 'terms: PI,private eye,private detective'
+        terms: '<translate with synonyms or related terms for ''Private Investigator Office'', separated by commas>'
+      office/quango:
+        # office=quango
+        name: Quango Office
+        # 'terms: Quasi-Autonomous Non-Government Organisation,Quasi-Autonomous Non-Government Organization,Quasi-Autonomous NGO'
+        terms: '<translate with synonyms or related terms for ''Quango Office'', separated by commas>'
       office/research:
         # office=research
         name: Research Office
         terms: '<translate with synonyms or related terms for ''Research Office'', separated by commas>'
+      office/surveyor:
+        # office=surveyor
+        name: Surveyor Office
+        terms: '<translate with synonyms or related terms for ''Surveyor Office'', separated by commas>'
+      office/tax_advisor:
+        # office=tax_advisor
+        name: Tax Advisor Office
+        # 'terms: tax,tax consultant'
+        terms: '<translate with synonyms or related terms for ''Tax Advisor Office'', separated by commas>'
       office/telecommunication:
         # office=telecommunication
         name: Telecom Office
@@ -4098,6 +4169,11 @@ en:
       office/travel_agent:
         # office=travel_agent
         name: Travel Agency
+      office/water_utility:
+        # office=water_utility
+        name: Water Utility Office
+        # 'terms: water board,utility'
+        terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
       piste:
         # 'piste:type=*'
         name: Piste/Ski Trail
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 758d3c0a6..ab09049d3 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11512,6 +11512,50 @@
             "terms": [],
             "name": "Administrative Office"
         },
+        "office/adoption_agency": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "adoption_agency"
+            },
+            "terms": [],
+            "name": "Adoption Agency"
+        },
+        "office/advertising_agency": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "advertising_agency"
+            },
+            "terms": [
+                "ad",
+                "ad agency",
+                "advert agency",
+                "advertising",
+                "marketing"
+            ],
+            "name": "Advertising Agency"
+        },
         "office/architect": {
             "icon": "commercial",
             "fields": [
@@ -11531,6 +11575,52 @@
             "terms": [],
             "name": "Architect"
         },
+        "office/association": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "association"
+            },
+            "terms": [
+                "association",
+                "non-profit",
+                "nonprofit",
+                "organization",
+                "society"
+            ],
+            "name": "Nonprofit Organization Office"
+        },
+        "office/charity": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "charity"
+            },
+            "terms": [
+                "charitable organization"
+            ],
+            "name": "Charity Office"
+        },
         "office/company": {
             "icon": "commercial",
             "fields": [
@@ -11619,6 +11709,30 @@
             ],
             "name": "Employment Agency"
         },
+        "office/energy_supplier": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "energy_supplier"
+            },
+            "terms": [
+                "electricity",
+                "energy company",
+                "energy utility",
+                "gas utility"
+            ],
+            "name": "Energy Supplier Office"
+        },
         "office/estate_agent": {
             "icon": "commercial",
             "fields": [
@@ -11657,6 +11771,46 @@
             "terms": [],
             "name": "Financial Office"
         },
+        "office/forestry": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "forestry"
+            },
+            "terms": [
+                "forest"
+            ],
+            "name": "Forestry Office"
+        },
+        "office/foundation": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "foundation"
+            },
+            "terms": [],
+            "name": "Foundation Office"
+        },
         "office/government": {
             "icon": "commercial",
             "fields": [
@@ -11706,6 +11860,57 @@
             },
             "name": "Register Office"
         },
+        "office/government/tax": {
+            "icon": "town-hall",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours",
+                "operator"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "fiscal authorities",
+                "revenue office",
+                "tax office"
+            ],
+            "tags": {
+                "office": "government",
+                "government": "tax"
+            },
+            "reference": {
+                "key": "government",
+                "value": "tax"
+            },
+            "name": "Tax and Revenue Office"
+        },
+        "office/guide": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "guide"
+            },
+            "terms": [
+                "dive guide",
+                "mountain guide",
+                "tour guide"
+            ],
+            "name": "Guide Office"
+        },
         "office/insurance": {
             "icon": "commercial",
             "fields": [
@@ -11793,6 +11998,27 @@
             ],
             "name": "Notary Office"
         },
+        "office/moving_company": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "moving_company"
+            },
+            "terms": [
+                "relocation"
+            ],
+            "name": "Moving Company Office"
+        },
         "office/newspaper": {
             "icon": "commercial",
             "fields": [
@@ -11832,6 +12058,25 @@
             "terms": [],
             "name": "NGO Office"
         },
+        "office/notary": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "notary"
+            },
+            "terms": [],
+            "name": "Notary Office"
+        },
         "office/political_party": {
             "icon": "commercial",
             "fields": [
@@ -11851,6 +12096,52 @@
             "terms": [],
             "name": "Political Party"
         },
+        "office/private_investigator": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "private_investigator"
+            },
+            "terms": [
+                "PI",
+                "private eye",
+                "private detective"
+            ],
+            "name": "Private Investigator Office"
+        },
+        "office/quango": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "quango"
+            },
+            "terms": [
+                "Quasi-Autonomous Non-Government Organisation",
+                "Quasi-Autonomous Non-Government Organization",
+                "Quasi-Autonomous NGO"
+            ],
+            "name": "Quango Office"
+        },
         "office/research": {
             "icon": "commercial",
             "fields": [
@@ -11870,6 +12161,47 @@
             "terms": [],
             "name": "Research Office"
         },
+        "office/surveyor": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "surveyor"
+            },
+            "terms": [],
+            "name": "Surveyor Office"
+        },
+        "office/tax_advisor": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "tax_advisor"
+            },
+            "terms": [
+                "tax",
+                "tax consultant"
+            ],
+            "name": "Tax Advisor Office"
+        },
         "office/telecommunication": {
             "icon": "commercial",
             "fields": [
@@ -11908,6 +12240,29 @@
             "terms": [],
             "name": "Therapist"
         },
+        "office/water_utility": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours",
+                "operator"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "water_utility"
+            },
+            "terms": [
+                "water board",
+                "utility"
+            ],
+            "name": "Water Utility Office"
+        },
         "piste": {
             "icon": "skiing",
             "fields": [
diff --git a/data/presets/presets/office/adoption_agency.json b/data/presets/presets/office/adoption_agency.json
new file mode 100644
index 000000000..b75d3b678
--- /dev/null
+++ b/data/presets/presets/office/adoption_agency.json
@@ -0,0 +1,19 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "adoption_agency"
+  },
+  "terms": [],
+  "name": "Adoption Agency"
+}
diff --git a/data/presets/presets/office/advertising_agency.json b/data/presets/presets/office/advertising_agency.json
new file mode 100644
index 000000000..041383c84
--- /dev/null
+++ b/data/presets/presets/office/advertising_agency.json
@@ -0,0 +1,25 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "advertising_agency"
+  },
+  "terms": [
+    "ad",
+    "ad agency",
+    "advert agency",
+    "advertising",
+    "marketing"
+  ],
+  "name": "Advertising Agency"
+}
diff --git a/data/presets/presets/office/association.json b/data/presets/presets/office/association.json
new file mode 100644
index 000000000..58ee31ea7
--- /dev/null
+++ b/data/presets/presets/office/association.json
@@ -0,0 +1,25 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "association"
+  },
+  "terms": [
+    "association",
+    "non-profit",
+    "nonprofit",
+    "organization",
+    "society"
+  ],
+  "name": "Nonprofit Organization Office"
+}
diff --git a/data/presets/presets/office/charity.json b/data/presets/presets/office/charity.json
new file mode 100644
index 000000000..3828e3742
--- /dev/null
+++ b/data/presets/presets/office/charity.json
@@ -0,0 +1,21 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "charity"
+  },
+  "terms": [
+    "charitable organization"
+  ],
+  "name": "Charity Office"
+}
diff --git a/data/presets/presets/office/energy_supplier.json b/data/presets/presets/office/energy_supplier.json
new file mode 100644
index 000000000..002b9cf72
--- /dev/null
+++ b/data/presets/presets/office/energy_supplier.json
@@ -0,0 +1,24 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "energy_supplier"
+  },
+  "terms": [
+    "electricity",
+    "energy company",
+    "energy utility",
+    "gas utility"
+  ],
+  "name": "Energy Supplier Office"
+}
diff --git a/data/presets/presets/office/forestry.json b/data/presets/presets/office/forestry.json
new file mode 100644
index 000000000..2c8f62f48
--- /dev/null
+++ b/data/presets/presets/office/forestry.json
@@ -0,0 +1,21 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "forestry"
+  },
+  "terms": [
+    "forest"
+  ],
+  "name": "Forestry Office"
+}
diff --git a/data/presets/presets/office/foundation.json b/data/presets/presets/office/foundation.json
new file mode 100644
index 000000000..37812ef50
--- /dev/null
+++ b/data/presets/presets/office/foundation.json
@@ -0,0 +1,19 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "foundation"
+  },
+  "terms": [],
+  "name": "Foundation Office"
+}
diff --git a/data/presets/presets/office/government/tax.json b/data/presets/presets/office/government/tax.json
new file mode 100644
index 000000000..87e9a8854
--- /dev/null
+++ b/data/presets/presets/office/government/tax.json
@@ -0,0 +1,28 @@
+{
+  "icon": "town-hall",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours",
+      "operator"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "terms": [
+      "fiscal authorities",
+      "revenue office",
+      "tax office"
+  ],
+  "tags": {
+      "office": "government",
+      "government": "tax"
+  },
+  "reference": {
+      "key": "government",
+      "value": "tax"
+  },
+  "name": "Tax and Revenue Office"
+}
diff --git a/data/presets/presets/office/guide.json b/data/presets/presets/office/guide.json
new file mode 100644
index 000000000..32fbf1d20
--- /dev/null
+++ b/data/presets/presets/office/guide.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "guide"
+  },
+  "terms": [
+    "dive guide",
+    "mountain guide",
+    "tour guide"
+  ],
+  "name": "Guide Office"
+}
diff --git a/data/presets/presets/office/moving_company.json b/data/presets/presets/office/moving_company.json
new file mode 100644
index 000000000..1d0d36bd8
--- /dev/null
+++ b/data/presets/presets/office/moving_company.json
@@ -0,0 +1,21 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "moving_company"
+  },
+  "terms": [
+    "relocation"
+  ],
+  "name": "Moving Company Office"
+}
diff --git a/data/presets/presets/office/notary.json b/data/presets/presets/office/notary.json
new file mode 100644
index 000000000..88219d9ad
--- /dev/null
+++ b/data/presets/presets/office/notary.json
@@ -0,0 +1,19 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "notary"
+  },
+  "terms": [],
+  "name": "Notary Office"
+}
diff --git a/data/presets/presets/office/private_investigator.json b/data/presets/presets/office/private_investigator.json
new file mode 100644
index 000000000..6b9e5e3ad
--- /dev/null
+++ b/data/presets/presets/office/private_investigator.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "private_investigator"
+  },
+  "terms": [
+    "PI",
+    "private eye",
+    "private detective"
+  ],
+  "name": "Private Investigator Office"
+}
diff --git a/data/presets/presets/office/quango.json b/data/presets/presets/office/quango.json
new file mode 100644
index 000000000..ba1eff513
--- /dev/null
+++ b/data/presets/presets/office/quango.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "quango"
+  },
+  "terms": [
+    "Quasi-Autonomous Non-Government Organisation",
+    "Quasi-Autonomous Non-Government Organization",
+    "Quasi-Autonomous NGO"
+  ],
+  "name": "Quango Office"
+}
diff --git a/data/presets/presets/office/surveyor.json b/data/presets/presets/office/surveyor.json
new file mode 100644
index 000000000..0485eba31
--- /dev/null
+++ b/data/presets/presets/office/surveyor.json
@@ -0,0 +1,19 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "surveyor"
+  },
+  "terms": [],
+  "name": "Surveyor Office"
+}
diff --git a/data/presets/presets/office/tax_advisor.json b/data/presets/presets/office/tax_advisor.json
new file mode 100644
index 000000000..ac6b413a8
--- /dev/null
+++ b/data/presets/presets/office/tax_advisor.json
@@ -0,0 +1,22 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "tax_advisor"
+  },
+  "terms": [
+    "tax",
+    "tax consultant"
+  ],
+  "name": "Tax Advisor Office"
+}
diff --git a/data/presets/presets/office/water_utility.json b/data/presets/presets/office/water_utility.json
new file mode 100644
index 000000000..b300d14b4
--- /dev/null
+++ b/data/presets/presets/office/water_utility.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours",
+      "operator"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "water_utility"
+  },
+  "terms": [
+    "water board",
+    "utility"
+  ],
+  "name": "Water Utility Office"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 69fc49d1a..8555c538e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2173,10 +2173,26 @@
             "key": "office",
             "value": "administrative"
         },
+        {
+            "key": "office",
+            "value": "adoption_agency"
+        },
+        {
+            "key": "office",
+            "value": "advertising_agency"
+        },
         {
             "key": "office",
             "value": "architect"
         },
+        {
+            "key": "office",
+            "value": "association"
+        },
+        {
+            "key": "office",
+            "value": "charity"
+        },
         {
             "key": "office",
             "value": "company"
@@ -2193,6 +2209,10 @@
             "key": "office",
             "value": "employment_agency"
         },
+        {
+            "key": "office",
+            "value": "energy_supplier"
+        },
         {
             "key": "office",
             "value": "estate_agent"
@@ -2201,6 +2221,14 @@
             "key": "office",
             "value": "financial"
         },
+        {
+            "key": "office",
+            "value": "forestry"
+        },
+        {
+            "key": "office",
+            "value": "foundation"
+        },
         {
             "key": "office",
             "value": "government"
@@ -2209,6 +2237,14 @@
             "key": "government",
             "value": "register_office"
         },
+        {
+            "key": "government",
+            "value": "tax"
+        },
+        {
+            "key": "office",
+            "value": "guide"
+        },
         {
             "key": "office",
             "value": "insurance"
@@ -2225,6 +2261,10 @@
             "key": "lawyer",
             "value": "notary"
         },
+        {
+            "key": "office",
+            "value": "moving_company"
+        },
         {
             "key": "office",
             "value": "newspaper"
@@ -2233,14 +2273,34 @@
             "key": "office",
             "value": "ngo"
         },
+        {
+            "key": "office",
+            "value": "notary"
+        },
         {
             "key": "office",
             "value": "political_party"
         },
+        {
+            "key": "office",
+            "value": "private_investigator"
+        },
+        {
+            "key": "office",
+            "value": "quango"
+        },
         {
             "key": "office",
             "value": "research"
         },
+        {
+            "key": "office",
+            "value": "surveyor"
+        },
+        {
+            "key": "office",
+            "value": "tax_advisor"
+        },
         {
             "key": "office",
             "value": "telecommunication"
@@ -2249,6 +2309,10 @@
             "key": "office",
             "value": "therapist"
         },
+        {
+            "key": "office",
+            "value": "water_utility"
+        },
         {
             "key": "piste:type"
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e479887b7..84a6d6e50 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4606,10 +4606,26 @@
                     "name": "Administrative Office",
                     "terms": ""
                 },
+                "office/adoption_agency": {
+                    "name": "Adoption Agency",
+                    "terms": ""
+                },
+                "office/advertising_agency": {
+                    "name": "Advertising Agency",
+                    "terms": "ad,ad agency,advert agency,advertising,marketing"
+                },
                 "office/architect": {
                     "name": "Architect",
                     "terms": ""
                 },
+                "office/association": {
+                    "name": "Nonprofit Organization Office",
+                    "terms": "association,non-profit,nonprofit,organization,society"
+                },
+                "office/charity": {
+                    "name": "Charity Office",
+                    "terms": "charitable organization"
+                },
                 "office/company": {
                     "name": "Company Office",
                     "terms": ""
@@ -4626,6 +4642,10 @@
                     "name": "Employment Agency",
                     "terms": "job"
                 },
+                "office/energy_supplier": {
+                    "name": "Energy Supplier Office",
+                    "terms": "electricity,energy company,energy utility,gas utility"
+                },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
                     "terms": ""
@@ -4634,6 +4654,14 @@
                     "name": "Financial Office",
                     "terms": ""
                 },
+                "office/forestry": {
+                    "name": "Forestry Office",
+                    "terms": "forest"
+                },
+                "office/foundation": {
+                    "name": "Foundation Office",
+                    "terms": ""
+                },
                 "office/government": {
                     "name": "Government Office",
                     "terms": ""
@@ -4642,6 +4670,14 @@
                     "name": "Register Office",
                     "terms": "clerk,marriage,death,birth,certificate"
                 },
+                "office/government/tax": {
+                    "name": "Tax and Revenue Office",
+                    "terms": "fiscal authorities,revenue office,tax office"
+                },
+                "office/guide": {
+                    "name": "Guide Office",
+                    "terms": "dive guide,mountain guide,tour guide"
+                },
                 "office/insurance": {
                     "name": "Insurance Office",
                     "terms": ""
@@ -4658,6 +4694,10 @@
                     "name": "Notary Office",
                     "terms": "clerk,signature,wills,deeds,estate"
                 },
+                "office/moving_company": {
+                    "name": "Moving Company Office",
+                    "terms": "relocation"
+                },
                 "office/newspaper": {
                     "name": "Newspaper",
                     "terms": ""
@@ -4666,14 +4706,34 @@
                     "name": "NGO Office",
                     "terms": ""
                 },
+                "office/notary": {
+                    "name": "Notary Office",
+                    "terms": ""
+                },
                 "office/political_party": {
                     "name": "Political Party",
                     "terms": ""
                 },
+                "office/private_investigator": {
+                    "name": "Private Investigator Office",
+                    "terms": "PI,private eye,private detective"
+                },
+                "office/quango": {
+                    "name": "Quango Office",
+                    "terms": "Quasi-Autonomous Non-Government Organisation,Quasi-Autonomous Non-Government Organization,Quasi-Autonomous NGO"
+                },
                 "office/research": {
                     "name": "Research Office",
                     "terms": ""
                 },
+                "office/surveyor": {
+                    "name": "Surveyor Office",
+                    "terms": ""
+                },
+                "office/tax_advisor": {
+                    "name": "Tax Advisor Office",
+                    "terms": "tax,tax consultant"
+                },
                 "office/telecommunication": {
                     "name": "Telecom Office",
                     "terms": ""
@@ -4682,6 +4742,10 @@
                     "name": "Therapist",
                     "terms": ""
                 },
+                "office/water_utility": {
+                    "name": "Water Utility Office",
+                    "terms": "water board,utility"
+                },
                 "piste": {
                     "name": "Piste/Ski Trail",
                     "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"