diff --git a/data/presets.yaml b/data/presets.yaml
index ef0a2ecf7..e911bed9e 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 11baedaf9..a2bc5b5be 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 0d6e104de..041383c84 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 b82b36ba5..c356a033a 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 000000000..832b3c273
--- /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 7b2c52b2f..7430da5e5 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 620d41d3e..7e33f64a7 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": ""