diff --git a/data/presets.yaml b/data/presets.yaml
index 0a51763e5..fbb7bb03f 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4006,8 +4006,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Office'', separated by commas>'
       office/accountant:
         # office=accountant
-        name: Accountant
-        terms: '<translate with synonyms or related terms for ''Accountant'', separated by commas>'
+        name: Accountant Office
+        terms: '<translate with synonyms or related terms for ''Accountant Office'', separated by commas>'
       office/administrative:
         # office=administrative
         name: Administrative Office
@@ -4023,8 +4023,8 @@ en:
         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>'
+        name: Architect Office
+        terms: '<translate with synonyms or related terms for ''Architect Office'', separated by commas>'
       office/association:
         # office=association
         name: Nonprofit Organization Office
@@ -4069,7 +4069,7 @@ en:
       office/forestry:
         # office=forestry
         name: Forestry Office
-        # 'terms: forest'
+        # 'terms: forest,ranger'
         terms: '<translate with synonyms or related terms for ''Forestry Office'', separated by commas>'
       office/foundation:
         # office=foundation
@@ -4091,17 +4091,18 @@ en:
         terms: '<translate with synonyms or related terms for ''Tax and Revenue Office'', separated by commas>'
       office/guide:
         # office=guide
-        name: Guide Office
+        name: Tour Guide Office
         # 'terms: dive guide,mountain guide,tour guide'
-        terms: '<translate with synonyms or related terms for ''Guide Office'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Tour Guide Office'', separated by commas>'
       office/insurance:
         # office=insurance
         name: Insurance Office
         terms: '<translate with synonyms or related terms for ''Insurance Office'', separated by commas>'
       office/it:
         # office=it
-        name: IT Office
-        terms: '<translate with synonyms or related terms for ''IT Office'', separated by commas>'
+        name: Information Technology Office
+        # 'terms: computer,information,software,technology'
+        terms: '<translate with synonyms or related terms for ''Information Technology Office'', separated by commas>'
       office/lawyer:
         # office=lawyer
         name: Law Office
@@ -4118,11 +4119,12 @@ en:
         terms: '<translate with synonyms or related terms for ''Moving Company Office'', separated by commas>'
       office/newspaper:
         # office=newspaper
-        name: Newspaper
-        terms: '<translate with synonyms or related terms for ''Newspaper'', separated by commas>'
+        name: Newspaper Office
+        terms: '<translate with synonyms or related terms for ''Newspaper Office'', separated by commas>'
       office/ngo:
         # office=ngo
         name: NGO Office
+        # 'terms: ngo,non government,non-government,organization,organisation'
         terms: '<translate with synonyms or related terms for ''NGO Office'', separated by commas>'
       office/notary:
         # office=notary
@@ -4142,9 +4144,9 @@ en:
         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>'
+        name: Quasi-NGO Office
+        # 'terms: ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous'
+        terms: '<translate with synonyms or related terms for ''Quasi-NGO Office'', separated by commas>'
       office/research:
         # office=research
         name: Research Office
@@ -4164,8 +4166,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Telecom Office'', separated by commas>'
       office/therapist:
         # office=therapist
-        name: Therapist
-        terms: '<translate with synonyms or related terms for ''Therapist'', separated by commas>'
+        name: Therapist Office
+        # 'terms: therapy'
+        terms: '<translate with synonyms or related terms for ''Therapist Office'', separated by commas>'
       office/travel_agent:
         # office=travel_agent
         name: Travel Agency
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ab09049d3..a16d98c5f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11491,7 +11491,7 @@
                 "office": "accountant"
             },
             "terms": [],
-            "name": "Accountant"
+            "name": "Accountant Office"
         },
         "office/administrative": {
             "icon": "commercial",
@@ -11573,7 +11573,7 @@
                 "office": "architect"
             },
             "terms": [],
-            "name": "Architect"
+            "name": "Architect Office"
         },
         "office/association": {
             "icon": "commercial",
@@ -11788,7 +11788,8 @@
                 "office": "forestry"
             },
             "terms": [
-                "forest"
+                "forest",
+                "ranger"
             ],
             "name": "Forestry Office"
         },
@@ -11909,7 +11910,7 @@
                 "mountain guide",
                 "tour guide"
             ],
-            "name": "Guide Office"
+            "name": "Tour Guide Office"
         },
         "office/insurance": {
             "icon": "commercial",
@@ -11946,8 +11947,13 @@
             "tags": {
                 "office": "it"
             },
-            "terms": [],
-            "name": "IT Office"
+            "terms": [
+                "computer",
+                "information",
+                "software",
+                "technology"
+            ],
+            "name": "Information Technology Office"
         },
         "office/lawyer": {
             "icon": "commercial",
@@ -12036,7 +12042,7 @@
                 "office": "newspaper"
             },
             "terms": [],
-            "name": "Newspaper"
+            "name": "Newspaper Office"
         },
         "office/ngo": {
             "icon": "commercial",
@@ -12055,7 +12061,13 @@
             "tags": {
                 "office": "ngo"
             },
-            "terms": [],
+            "terms": [
+                "ngo",
+                "non government",
+                "non-government",
+                "organization",
+                "organisation"
+            ],
             "name": "NGO Office"
         },
         "office/notary": {
@@ -12136,11 +12148,15 @@
                 "office": "quango"
             },
             "terms": [
-                "Quasi-Autonomous Non-Government Organisation",
-                "Quasi-Autonomous Non-Government Organization",
-                "Quasi-Autonomous NGO"
+                "ngo",
+                "non government",
+                "non-government",
+                "organization",
+                "organisation",
+                "quasi autonomous",
+                "quasi-autonomous"
             ],
-            "name": "Quango Office"
+            "name": "Quasi-NGO Office"
         },
         "office/research": {
             "icon": "commercial",
@@ -12237,8 +12253,10 @@
             "tags": {
                 "office": "therapist"
             },
-            "terms": [],
-            "name": "Therapist"
+            "terms": [
+                "therapy"
+            ],
+            "name": "Therapist Office"
         },
         "office/water_utility": {
             "icon": "commercial",
diff --git a/data/presets/presets/office/accountant.json b/data/presets/presets/office/accountant.json
index d533bd0f7..e00917347 100644
--- a/data/presets/presets/office/accountant.json
+++ b/data/presets/presets/office/accountant.json
@@ -15,5 +15,5 @@
         "office": "accountant"
     },
     "terms": [],
-    "name": "Accountant"
+    "name": "Accountant Office"
 }
diff --git a/data/presets/presets/office/advertising_agency.json b/data/presets/presets/office/advertising_agency.json
index 041383c84..956facff9 100644
--- a/data/presets/presets/office/advertising_agency.json
+++ b/data/presets/presets/office/advertising_agency.json
@@ -15,11 +15,11 @@
       "office": "advertising_agency"
   },
   "terms": [
-    "ad",
-    "ad agency",
-    "advert agency",
-    "advertising",
-    "marketing"
+      "ad",
+      "ad agency",
+      "advert agency",
+      "advertising",
+      "marketing"
   ],
   "name": "Advertising Agency"
 }
diff --git a/data/presets/presets/office/architect.json b/data/presets/presets/office/architect.json
index 70e660c0a..a61a7f4b5 100644
--- a/data/presets/presets/office/architect.json
+++ b/data/presets/presets/office/architect.json
@@ -15,5 +15,5 @@
         "office": "architect"
     },
     "terms": [],
-    "name": "Architect"
+    "name": "Architect Office"
 }
diff --git a/data/presets/presets/office/association.json b/data/presets/presets/office/association.json
index 58ee31ea7..089ba95fe 100644
--- a/data/presets/presets/office/association.json
+++ b/data/presets/presets/office/association.json
@@ -15,11 +15,11 @@
       "office": "association"
   },
   "terms": [
-    "association",
-    "non-profit",
-    "nonprofit",
-    "organization",
-    "society"
+      "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
index 3828e3742..9bd7d0547 100644
--- a/data/presets/presets/office/charity.json
+++ b/data/presets/presets/office/charity.json
@@ -15,7 +15,7 @@
       "office": "charity"
   },
   "terms": [
-    "charitable organization"
+      "charitable organization"
   ],
   "name": "Charity Office"
 }
diff --git a/data/presets/presets/office/energy_supplier.json b/data/presets/presets/office/energy_supplier.json
index 002b9cf72..7462c9e4e 100644
--- a/data/presets/presets/office/energy_supplier.json
+++ b/data/presets/presets/office/energy_supplier.json
@@ -15,10 +15,10 @@
       "office": "energy_supplier"
   },
   "terms": [
-    "electricity",
-    "energy company",
-    "energy utility",
-    "gas utility"
+      "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
index 2c8f62f48..42e599297 100644
--- a/data/presets/presets/office/forestry.json
+++ b/data/presets/presets/office/forestry.json
@@ -15,7 +15,8 @@
       "office": "forestry"
   },
   "terms": [
-    "forest"
+      "forest",
+      "ranger"
   ],
   "name": "Forestry Office"
 }
diff --git a/data/presets/presets/office/guide.json b/data/presets/presets/office/guide.json
index 32fbf1d20..14ab1178d 100644
--- a/data/presets/presets/office/guide.json
+++ b/data/presets/presets/office/guide.json
@@ -15,9 +15,9 @@
       "office": "guide"
   },
   "terms": [
-    "dive guide",
-    "mountain guide",
-    "tour guide"
+      "dive guide",
+      "mountain guide",
+      "tour guide"
   ],
-  "name": "Guide Office"
+  "name": "Tour Guide Office"
 }
diff --git a/data/presets/presets/office/it.json b/data/presets/presets/office/it.json
index 937b332e8..37e54bcc5 100644
--- a/data/presets/presets/office/it.json
+++ b/data/presets/presets/office/it.json
@@ -14,6 +14,11 @@
     "tags": {
         "office": "it"
     },
-    "terms": [],
-    "name": "IT Office"
+    "terms": [
+        "computer",
+        "information",
+        "software",
+        "technology"
+    ],
+    "name": "Information Technology Office"
 }
diff --git a/data/presets/presets/office/moving_company.json b/data/presets/presets/office/moving_company.json
index 1d0d36bd8..b019a2667 100644
--- a/data/presets/presets/office/moving_company.json
+++ b/data/presets/presets/office/moving_company.json
@@ -15,7 +15,7 @@
       "office": "moving_company"
   },
   "terms": [
-    "relocation"
+      "relocation"
   ],
   "name": "Moving Company Office"
 }
diff --git a/data/presets/presets/office/newspaper.json b/data/presets/presets/office/newspaper.json
index 91d71e146..73e306731 100644
--- a/data/presets/presets/office/newspaper.json
+++ b/data/presets/presets/office/newspaper.json
@@ -15,5 +15,5 @@
         "office": "newspaper"
     },
     "terms": [],
-    "name": "Newspaper"
+    "name": "Newspaper Office"
 }
diff --git a/data/presets/presets/office/ngo.json b/data/presets/presets/office/ngo.json
index 9128f0130..76083e287 100644
--- a/data/presets/presets/office/ngo.json
+++ b/data/presets/presets/office/ngo.json
@@ -15,6 +15,12 @@
     "tags": {
         "office": "ngo"
     },
-    "terms": [],
+    "terms": [
+        "ngo",
+        "non government",
+        "non-government",
+        "organization",
+        "organisation"
+    ],
     "name": "NGO Office"
 }
diff --git a/data/presets/presets/office/private_investigator.json b/data/presets/presets/office/private_investigator.json
index 6b9e5e3ad..8480a8e1e 100644
--- a/data/presets/presets/office/private_investigator.json
+++ b/data/presets/presets/office/private_investigator.json
@@ -15,9 +15,9 @@
       "office": "private_investigator"
   },
   "terms": [
-    "PI",
-    "private eye",
-    "private detective"
+      "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
index ba1eff513..6dcb66f88 100644
--- a/data/presets/presets/office/quango.json
+++ b/data/presets/presets/office/quango.json
@@ -15,9 +15,13 @@
       "office": "quango"
   },
   "terms": [
-    "Quasi-Autonomous Non-Government Organisation",
-    "Quasi-Autonomous Non-Government Organization",
-    "Quasi-Autonomous NGO"
+      "ngo",
+      "non government",
+      "non-government",
+      "organization",
+      "organisation",
+      "quasi autonomous",
+      "quasi-autonomous"
   ],
-  "name": "Quango Office"
+  "name": "Quasi-NGO Office"
 }
diff --git a/data/presets/presets/office/therapist.json b/data/presets/presets/office/therapist.json
index 337aea2b5..06a770a14 100644
--- a/data/presets/presets/office/therapist.json
+++ b/data/presets/presets/office/therapist.json
@@ -14,6 +14,8 @@
     "tags": {
         "office": "therapist"
     },
-    "terms": [],
-    "name": "Therapist"
+    "terms": [
+        "therapy"
+    ],
+    "name": "Therapist Office"
 }
diff --git a/data/presets/presets/office/water_utility.json b/data/presets/presets/office/water_utility.json
index b300d14b4..ceb61e14b 100644
--- a/data/presets/presets/office/water_utility.json
+++ b/data/presets/presets/office/water_utility.json
@@ -16,8 +16,8 @@
       "office": "water_utility"
   },
   "terms": [
-    "water board",
-    "utility"
+      "water board",
+      "utility"
   ],
   "name": "Water Utility Office"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 84a6d6e50..3b347271d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4599,7 +4599,7 @@
                     "terms": ""
                 },
                 "office/accountant": {
-                    "name": "Accountant",
+                    "name": "Accountant Office",
                     "terms": ""
                 },
                 "office/administrative": {
@@ -4615,7 +4615,7 @@
                     "terms": "ad,ad agency,advert agency,advertising,marketing"
                 },
                 "office/architect": {
-                    "name": "Architect",
+                    "name": "Architect Office",
                     "terms": ""
                 },
                 "office/association": {
@@ -4656,7 +4656,7 @@
                 },
                 "office/forestry": {
                     "name": "Forestry Office",
-                    "terms": "forest"
+                    "terms": "forest,ranger"
                 },
                 "office/foundation": {
                     "name": "Foundation Office",
@@ -4675,7 +4675,7 @@
                     "terms": "fiscal authorities,revenue office,tax office"
                 },
                 "office/guide": {
-                    "name": "Guide Office",
+                    "name": "Tour Guide Office",
                     "terms": "dive guide,mountain guide,tour guide"
                 },
                 "office/insurance": {
@@ -4683,8 +4683,8 @@
                     "terms": ""
                 },
                 "office/it": {
-                    "name": "IT Office",
-                    "terms": ""
+                    "name": "Information Technology Office",
+                    "terms": "computer,information,software,technology"
                 },
                 "office/lawyer": {
                     "name": "Law Office",
@@ -4699,12 +4699,12 @@
                     "terms": "relocation"
                 },
                 "office/newspaper": {
-                    "name": "Newspaper",
+                    "name": "Newspaper Office",
                     "terms": ""
                 },
                 "office/ngo": {
                     "name": "NGO Office",
-                    "terms": ""
+                    "terms": "ngo,non government,non-government,organization,organisation"
                 },
                 "office/notary": {
                     "name": "Notary Office",
@@ -4719,8 +4719,8 @@
                     "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"
+                    "name": "Quasi-NGO Office",
+                    "terms": "ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous"
                 },
                 "office/research": {
                     "name": "Research Office",
@@ -4739,8 +4739,8 @@
                     "terms": ""
                 },
                 "office/therapist": {
-                    "name": "Therapist",
-                    "terms": ""
+                    "name": "Therapist Office",
+                    "terms": "therapy"
                 },
                 "office/water_utility": {
                     "name": "Water Utility Office",