From 412fa22c63edd271afc375e1ad1dc74ffffe764e Mon Sep 17 00:00:00 2001
From: Natalia Margolis <nmargolis89@gmail.com>
Date: Mon, 30 Oct 2017 18:41:05 -0700
Subject: [PATCH 1/4] Add office/association preset

---
 data/presets.yaml                            |  5 +++++
 data/presets/presets.json                    | 23 ++++++++++++++++++++
 data/presets/presets/office/association.json | 23 ++++++++++++++++++++
 data/taginfo.json                            |  4 ++++
 dist/locales/en.json                         |  4 ++++
 5 files changed, 59 insertions(+)
 create mode 100644 data/presets/presets/office/association.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 5427f707e3..a3b0f7c733 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4010,6 +4010,11 @@ en:
         # office=architect
         name: Architect
         terms: '<translate with synonyms or related terms for ''Architect'', separated by commas>'
+      office/association:
+        # office=association
+        name: Association
+        # 'terms: organization,non-profit,society'
+        terms: '<translate with synonyms or related terms for ''Association'', separated by commas>'
       office/company:
         # office=company
         name: Company Office
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4cc6ce40ff..0cefb5c18c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11498,6 +11498,29 @@
             "terms": [],
             "name": "Architect"
         },
+        "office/association": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "association"
+            },
+            "terms": [
+                "organization",
+                "non-profit",
+                "society"
+            ],
+            "name": "Association"
+        },
         "office/company": {
             "icon": "commercial",
             "fields": [
diff --git a/data/presets/presets/office/association.json b/data/presets/presets/office/association.json
new file mode 100644
index 0000000000..b82b36ba53
--- /dev/null
+++ b/data/presets/presets/office/association.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "association"
+  },
+  "terms": [
+    "organization",
+    "non-profit",
+    "society"
+  ],
+  "name": "Association"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 6e7f1651ee..3201077e23 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2173,6 +2173,10 @@
             "key": "office",
             "value": "architect"
         },
+        {
+            "key": "office",
+            "value": "association"
+        },
         {
             "key": "office",
             "value": "company"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 96768d2c4e..008b4ed282 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4606,6 +4606,10 @@
                     "name": "Architect",
                     "terms": ""
                 },
+                "office/association": {
+                    "name": "Association",
+                    "terms": "organization,non-profit,society"
+                },
                 "office/company": {
                     "name": "Company Office",
                     "terms": ""

From 926e949c18ebbeeb93f0cf510673d9241e70ae74 Mon Sep 17 00:00:00 2001
From: Natalia Margolis <nmargolis89@gmail.com>
Date: Mon, 30 Oct 2017 18:47:44 -0700
Subject: [PATCH 2/4] Add office/advertising_agency preset

---
 data/presets.yaml                             |  5 ++++
 data/presets/presets.json                     | 25 +++++++++++++++++++
 .../presets/office/advertising_agency.json    | 25 +++++++++++++++++++
 data/taginfo.json                             |  4 +++
 dist/locales/en.json                          |  4 +++
 5 files changed, 63 insertions(+)
 create mode 100644 data/presets/presets/office/advertising_agency.json

diff --git a/data/presets.yaml b/data/presets.yaml
index a3b0f7c733..ef0a2ecf71 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4006,6 +4006,11 @@ en:
         # office=administrative
         name: Administrative Office
         terms: '<translate with synonyms or related terms for ''Administrative Office'', separated by commas>'
+      office/advertising_agency:
+        # office=advertising_agency
+        name: Association
+        # 'terms: ad,ad agency,advert agency,advertising,marketing'
+        terms: '<translate with synonyms or related terms for ''Association'', separated by commas>'
       office/architect:
         # office=architect
         name: Architect
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0cefb5c18c..11baedaf9c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11479,6 +11479,31 @@
             "terms": [],
             "name": "Administrative Office"
         },
+        "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": "Association"
+        },
         "office/architect": {
             "icon": "commercial",
             "fields": [
diff --git a/data/presets/presets/office/advertising_agency.json b/data/presets/presets/office/advertising_agency.json
new file mode 100644
index 0000000000..0d6e104de9
--- /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": "Association"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 3201077e23..7b2c52b2fb 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2169,6 +2169,10 @@
             "key": "office",
             "value": "administrative"
         },
+        {
+            "key": "office",
+            "value": "advertising_agency"
+        },
         {
             "key": "office",
             "value": "architect"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 008b4ed282..620d41d3e9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4602,6 +4602,10 @@
                     "name": "Administrative Office",
                     "terms": ""
                 },
+                "office/advertising_agency": {
+                    "name": "Association",
+                    "terms": "ad,ad agency,advert agency,advertising,marketing"
+                },
                 "office/architect": {
                     "name": "Architect",
                     "terms": ""

From 4b9c428b9165c1d8778828b571cc66517bae55c8 Mon Sep 17 00:00:00 2001
From: Natalia Margolis <nmargolis89@gmail.com>
Date: Mon, 30 Oct 2017 19:05:07 -0700
Subject: [PATCH 3/4] Add office/surveyor

Fix name of advertising_agency
Alphebatize terms in association
---
 data/presets.yaml                             | 10 +++++---
 data/presets/presets.json                     | 23 +++++++++++++++++--
 .../presets/office/advertising_agency.json    |  2 +-
 data/presets/presets/office/association.json  |  2 +-
 data/presets/presets/office/surveyor.json     | 19 +++++++++++++++
 data/taginfo.json                             |  4 ++++
 dist/locales/en.json                          |  8 +++++--
 7 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 data/presets/presets/office/surveyor.json

diff --git a/data/presets.yaml b/data/presets.yaml
index ef0a2ecf71..e911bed9e8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4008,9 +4008,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Administrative Office'', separated by commas>'
       office/advertising_agency:
         # office=advertising_agency
-        name: Association
+        name: Advertising Agency
         # 'terms: ad,ad agency,advert agency,advertising,marketing'
-        terms: '<translate with synonyms or related terms for ''Association'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Advertising Agency'', separated by commas>'
       office/architect:
         # office=architect
         name: Architect
@@ -4018,7 +4018,7 @@ en:
       office/association:
         # office=association
         name: Association
-        # 'terms: organization,non-profit,society'
+        # 'terms: non-profit,organization,society'
         terms: '<translate with synonyms or related terms for ''Association'', separated by commas>'
       office/company:
         # office=company
@@ -4091,6 +4091,10 @@ en:
         # office=research
         name: Research Office
         terms: '<translate with synonyms or related terms for ''Research Office'', separated by commas>'
+      office/surveyor:
+        # office=surveyor
+        name: Surveyor
+        terms: '<translate with synonyms or related terms for ''Surveyor'', separated by commas>'
       office/telecommunication:
         # office=telecommunication
         name: Telecom Office
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 11baedaf9c..a2bc5b5bed 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11502,7 +11502,7 @@
                 "advertising",
                 "marketing"
             ],
-            "name": "Association"
+            "name": "Advertising Agency"
         },
         "office/architect": {
             "icon": "commercial",
@@ -11540,8 +11540,8 @@
                 "office": "association"
             },
             "terms": [
-                "organization",
                 "non-profit",
+                "organization",
                 "society"
             ],
             "name": "Association"
@@ -11885,6 +11885,25 @@
             "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/telecommunication": {
             "icon": "commercial",
             "fields": [
diff --git a/data/presets/presets/office/advertising_agency.json b/data/presets/presets/office/advertising_agency.json
index 0d6e104de9..041383c841 100644
--- a/data/presets/presets/office/advertising_agency.json
+++ b/data/presets/presets/office/advertising_agency.json
@@ -21,5 +21,5 @@
     "advertising",
     "marketing"
   ],
-  "name": "Association"
+  "name": "Advertising Agency"
 }
diff --git a/data/presets/presets/office/association.json b/data/presets/presets/office/association.json
index b82b36ba53..c356a033a7 100644
--- a/data/presets/presets/office/association.json
+++ b/data/presets/presets/office/association.json
@@ -15,8 +15,8 @@
       "office": "association"
   },
   "terms": [
-    "organization",
     "non-profit",
+    "organization",
     "society"
   ],
   "name": "Association"
diff --git a/data/presets/presets/office/surveyor.json b/data/presets/presets/office/surveyor.json
new file mode 100644
index 0000000000..832b3c2730
--- /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"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 7b2c52b2fb..7430da5e51 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2245,6 +2245,10 @@
             "key": "office",
             "value": "research"
         },
+        {
+            "key": "office",
+            "value": "surveyor"
+        },
         {
             "key": "office",
             "value": "telecommunication"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 620d41d3e9..7e33f64a7f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4603,7 +4603,7 @@
                     "terms": ""
                 },
                 "office/advertising_agency": {
-                    "name": "Association",
+                    "name": "Advertising Agency",
                     "terms": "ad,ad agency,advert agency,advertising,marketing"
                 },
                 "office/architect": {
@@ -4612,7 +4612,7 @@
                 },
                 "office/association": {
                     "name": "Association",
-                    "terms": "organization,non-profit,society"
+                    "terms": "non-profit,organization,society"
                 },
                 "office/company": {
                     "name": "Company Office",
@@ -4678,6 +4678,10 @@
                     "name": "Research Office",
                     "terms": ""
                 },
+                "office/surveyor": {
+                    "name": "Surveyor",
+                    "terms": ""
+                },
                 "office/telecommunication": {
                     "name": "Telecom Office",
                     "terms": ""

From 11dd9ec1b857f2bf19b4679632258d950ca88297 Mon Sep 17 00:00:00 2001
From: Natalia Margolis <nmargolis89@gmail.com>
Date: Tue, 31 Oct 2017 12:26:17 -0700
Subject: [PATCH 4/4] Add more missing office presets

- adoption_agency
- charity
- energy_supplier
- forestry
- foundation
- tax
- guide
- moving_company
- notary
- private_investigator
- quango
- surveyor
- tax_advisor
- water_utility
---
 data/presets.yaml                             |  72 ++++-
 data/presets/presets.json                     | 292 +++++++++++++++++-
 .../presets/office/adoption_agency.json       |  19 ++
 data/presets/presets/office/association.json  |   4 +-
 data/presets/presets/office/charity.json      |  21 ++
 .../presets/office/energy_supplier.json       |  24 ++
 data/presets/presets/office/forestry.json     |  21 ++
 data/presets/presets/office/foundation.json   |  19 ++
 .../presets/office/government/tax.json        |  28 ++
 data/presets/presets/office/guide.json        |  23 ++
 .../presets/office/moving_company.json        |  21 ++
 data/presets/presets/office/notary.json       |  19 ++
 .../presets/office/private_investigator.json  |  23 ++
 data/presets/presets/office/quango.json       |  23 ++
 data/presets/presets/office/surveyor.json     |   2 +-
 data/presets/presets/office/tax_advisor.json  |  22 ++
 .../presets/presets/office/water_utility.json |  23 ++
 data/taginfo.json                             |  52 ++++
 dist/locales/en.json                          |  58 +++-
 19 files changed, 754 insertions(+), 12 deletions(-)
 create mode 100644 data/presets/presets/office/adoption_agency.json
 create mode 100644 data/presets/presets/office/charity.json
 create mode 100644 data/presets/presets/office/energy_supplier.json
 create mode 100644 data/presets/presets/office/forestry.json
 create mode 100644 data/presets/presets/office/foundation.json
 create mode 100644 data/presets/presets/office/government/tax.json
 create mode 100644 data/presets/presets/office/guide.json
 create mode 100644 data/presets/presets/office/moving_company.json
 create mode 100644 data/presets/presets/office/notary.json
 create mode 100644 data/presets/presets/office/private_investigator.json
 create mode 100644 data/presets/presets/office/quango.json
 create mode 100644 data/presets/presets/office/tax_advisor.json
 create mode 100644 data/presets/presets/office/water_utility.json

diff --git a/data/presets.yaml b/data/presets.yaml
index e911bed9e8..2325e0a550 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4006,6 +4006,10 @@ 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
@@ -4017,9 +4021,14 @@ en:
         terms: '<translate with synonyms or related terms for ''Architect'', separated by commas>'
       office/association:
         # office=association
-        name: Association
-        # 'terms: non-profit,organization,society'
-        terms: '<translate with synonyms or related terms for ''Association'', separated by commas>'
+        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
@@ -4038,6 +4047,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
@@ -4046,6 +4060,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
@@ -4055,6 +4078,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
@@ -4072,6 +4105,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
@@ -4080,6 +4118,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
@@ -4087,14 +4129,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
-        terms: '<translate with synonyms or related terms for ''Surveyor'', separated by commas>'
+        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
@@ -4106,6 +4163,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 a2bc5b5bed..3a88063308 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11479,6 +11479,25 @@
             "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": [
@@ -11540,11 +11559,34 @@
                 "office": "association"
             },
             "terms": [
+                "association",
                 "non-profit",
+                "nonprofit",
                 "organization",
                 "society"
             ],
-            "name": "Association"
+            "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",
@@ -11634,6 +11676,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": [
@@ -11672,6 +11738,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": [
@@ -11721,6 +11827,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": [
@@ -11808,6 +11965,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": [
@@ -11847,6 +12025,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": [
@@ -11866,6 +12063,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": [
@@ -11902,7 +12145,29 @@
                 "office": "surveyor"
             },
             "terms": [],
-            "name": "Surveyor"
+            "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",
@@ -11942,6 +12207,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 0000000000..b75d3b678e
--- /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/association.json b/data/presets/presets/office/association.json
index c356a033a7..58ee31ea79 100644
--- a/data/presets/presets/office/association.json
+++ b/data/presets/presets/office/association.json
@@ -15,9 +15,11 @@
       "office": "association"
   },
   "terms": [
+    "association",
     "non-profit",
+    "nonprofit",
     "organization",
     "society"
   ],
-  "name": "Association"
+  "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 0000000000..3828e3742b
--- /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 0000000000..002b9cf722
--- /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 0000000000..2c8f62f48c
--- /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 0000000000..37812ef506
--- /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 0000000000..87e9a8854e
--- /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 0000000000..32fbf1d20d
--- /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 0000000000..1d0d36bd83
--- /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 0000000000..88219d9ad4
--- /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 0000000000..6b9e5e3ad7
--- /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 0000000000..ba1eff5136
--- /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
index 832b3c2730..0485eba316 100644
--- a/data/presets/presets/office/surveyor.json
+++ b/data/presets/presets/office/surveyor.json
@@ -15,5 +15,5 @@
       "office": "surveyor"
   },
   "terms": [],
-  "name": "Surveyor"
+  "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 0000000000..ac6b413a8f
--- /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 0000000000..b300d14b48
--- /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 7430da5e51..c868c53bf1 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2169,6 +2169,10 @@
             "key": "office",
             "value": "administrative"
         },
+        {
+            "key": "office",
+            "value": "adoption_agency"
+        },
         {
             "key": "office",
             "value": "advertising_agency"
@@ -2181,6 +2185,10 @@
             "key": "office",
             "value": "association"
         },
+        {
+            "key": "office",
+            "value": "charity"
+        },
         {
             "key": "office",
             "value": "company"
@@ -2197,6 +2205,10 @@
             "key": "office",
             "value": "employment_agency"
         },
+        {
+            "key": "office",
+            "value": "energy_supplier"
+        },
         {
             "key": "office",
             "value": "estate_agent"
@@ -2205,6 +2217,14 @@
             "key": "office",
             "value": "financial"
         },
+        {
+            "key": "office",
+            "value": "forestry"
+        },
+        {
+            "key": "office",
+            "value": "foundation"
+        },
         {
             "key": "office",
             "value": "government"
@@ -2213,6 +2233,14 @@
             "key": "government",
             "value": "register_office"
         },
+        {
+            "key": "government",
+            "value": "tax"
+        },
+        {
+            "key": "office",
+            "value": "guide"
+        },
         {
             "key": "office",
             "value": "insurance"
@@ -2229,6 +2257,10 @@
             "key": "lawyer",
             "value": "notary"
         },
+        {
+            "key": "office",
+            "value": "moving_company"
+        },
         {
             "key": "office",
             "value": "newspaper"
@@ -2237,10 +2269,22 @@
             "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"
@@ -2249,6 +2293,10 @@
             "key": "office",
             "value": "surveyor"
         },
+        {
+            "key": "office",
+            "value": "tax_advisor"
+        },
         {
             "key": "office",
             "value": "telecommunication"
@@ -2257,6 +2305,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 7e33f64a7f..8783d85703 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4602,6 +4602,10 @@
                     "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"
@@ -4611,8 +4615,12 @@
                     "terms": ""
                 },
                 "office/association": {
-                    "name": "Association",
-                    "terms": "non-profit,organization,society"
+                    "name": "Nonprofit Organization Office",
+                    "terms": "association,non-profit,nonprofit,organization,society"
+                },
+                "office/charity": {
+                    "name": "Charity Office",
+                    "terms": "charitable organization"
                 },
                 "office/company": {
                     "name": "Company Office",
@@ -4630,6 +4638,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": ""
@@ -4638,6 +4650,14 @@
                     "name": "Financial Office",
                     "terms": ""
                 },
+                "office/forestry": {
+                    "name": "Forestry Office",
+                    "terms": "forest"
+                },
+                "office/foundation": {
+                    "name": "Foundation Office",
+                    "terms": ""
+                },
                 "office/government": {
                     "name": "Government Office",
                     "terms": ""
@@ -4646,6 +4666,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": ""
@@ -4662,6 +4690,10 @@
                     "name": "Notary Office",
                     "terms": "clerk,signature,wills,deeds,estate"
                 },
+                "office/moving_company": {
+                    "name": "Moving Company Office",
+                    "terms": "relocation"
+                },
                 "office/newspaper": {
                     "name": "Newspaper",
                     "terms": ""
@@ -4670,18 +4702,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",
+                    "name": "Surveyor Office",
                     "terms": ""
                 },
+                "office/tax_advisor": {
+                    "name": "Tax Advisor Office",
+                    "terms": "tax,tax consultant"
+                },
                 "office/telecommunication": {
                     "name": "Telecom Office",
                     "terms": ""
@@ -4690,6 +4738,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"