diff --git a/data/presets/presets.json b/data/presets/presets.json
index 08c403d3f..ff753bec8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -859,7 +859,7 @@
   "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["area", "point"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
   "network/type/node_network": {"fields": ["name", "rwn_ref", "expected_rwn_route_relations", "rcn_ref", "expected_rcn_route_relations"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
   "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
-  "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+  "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
   "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "searchable": false, "name": "Administrative Office"},
   "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
   "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "name": "Travel Agency", "searchable": false},
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index 8c7f78271..21786a8ff 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -6,7 +6,9 @@
         "address",
         "building_area",
         "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
     ],
     "moreFields": [
         "air_conditioning",
@@ -23,10 +25,8 @@
         "level",
         "not/name",
         "operator",
-        "phone",
         "ref/vatin",
         "smoking",
-        "website",
         "wheelchair"
     ],
     "geometry": [