diff --git a/data/presets.yaml b/data/presets.yaml
index b1115f5bc..67c13ffe0 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1707,7 +1707,7 @@ en:
       amenity/doctors:
         # amenity=doctors
         name: Doctor
-        # 'terms: medic*'
+        # 'terms: medic*,physician'
         terms: '<translate with synonyms or related terms for ''Doctor'', separated by commas>'
       amenity/dojo:
         # amenity=dojo
@@ -3733,7 +3733,6 @@ en:
       office/physician:
         # office=physician
         name: Physician
-        terms: '<translate with synonyms or related terms for ''Physician'', separated by commas>'
       office/political_party:
         # office=political_party
         name: Political Party
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d3f401180..87907968d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1316,7 +1316,8 @@
                 "area"
             ],
             "terms": [
-                "medic*"
+                "medic*",
+                "physician"
             ],
             "tags": {
                 "amenity": "doctors"
@@ -10095,6 +10096,25 @@
             "terms": [],
             "name": "Office"
         },
+        "office/physician": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "physician"
+            },
+            "searchable": false,
+            "name": "Physician"
+        },
         "office/travel_agent": {
             "icon": "suitcase",
             "fields": [
@@ -10477,25 +10497,6 @@
             "terms": [],
             "name": "NGO Office"
         },
-        "office/physician": {
-            "icon": "commercial",
-            "fields": [
-                "name",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "geometry": [
-                "point",
-                "vertex",
-                "area"
-            ],
-            "tags": {
-                "office": "physician"
-            },
-            "terms": [],
-            "name": "Physician"
-        },
         "office/political_party": {
             "icon": "commercial",
             "fields": [
diff --git a/data/presets/presets/amenity/doctors.json b/data/presets/presets/amenity/doctors.json
index 2a765a01d..4d0c422e3 100644
--- a/data/presets/presets/amenity/doctors.json
+++ b/data/presets/presets/amenity/doctors.json
@@ -11,7 +11,8 @@
         "area"
     ],
     "terms": [
-        "medic*"
+        "medic*",
+        "physician"
     ],
     "tags": {
         "amenity": "doctors"
diff --git a/data/presets/presets/office/physician.json b/data/presets/presets/office/_physician.json
similarity index 91%
rename from data/presets/presets/office/physician.json
rename to data/presets/presets/office/_physician.json
index 3fac3e38c..42113ef36 100644
--- a/data/presets/presets/office/physician.json
+++ b/data/presets/presets/office/_physician.json
@@ -14,6 +14,6 @@
     "tags": {
         "office": "physician"
     },
-    "terms": [],
+    "searchable": false,
     "name": "Physician"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index b7b3e871f..8a28a452c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1990,6 +1990,10 @@
         {
             "key": "office"
         },
+        {
+            "key": "office",
+            "value": "physician"
+        },
         {
             "key": "office",
             "value": "travel_agent"
@@ -2062,10 +2066,6 @@
             "key": "office",
             "value": "ngo"
         },
-        {
-            "key": "office",
-            "value": "physician"
-        },
         {
             "key": "office",
             "value": "political_party"