diff --git a/data/presets.yaml b/data/presets.yaml
index 876eaf140..67e75f4ba 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -678,9 +678,6 @@ en:
       building/entrance: 
         name: Entrance
         terms: "<translate with synonyms or related terms for 'Entrance', separated by commas>"
-      building/farm_auxilary: 
-        name: Farm Building
-        terms: "<translate with synonyms or related terms for 'Farm Building', separated by commas>"
       building/garage: 
         name: Garage
         terms: "<translate with synonyms or related terms for 'Garage', separated by commas>"
@@ -690,9 +687,6 @@ en:
       building/greenhouse: 
         name: Greenhouse
         terms: "<translate with synonyms or related terms for 'Greenhouse', separated by commas>"
-      building/hanger: 
-        name: Hanger
-        terms: "<translate with synonyms or related terms for 'Hanger', separated by commas>"
       building/hospital: 
         name: Hospital Building
         terms: "<translate with synonyms or related terms for 'Hospital Building', separated by commas>"
@@ -730,11 +724,11 @@ en:
         name: Stable
         terms: "<translate with synonyms or related terms for 'Stable', separated by commas>"
       building/static_caravan: 
-        name: Static Caravan
-        terms: "<translate with synonyms or related terms for 'Static Caravan', separated by commas>"
+        name: Static Mobile Home
+        terms: "<translate with synonyms or related terms for 'Static Mobile Home', separated by commas>"
       building/terrace: 
-        name: Terraced Houses
-        terms: "<translate with synonyms or related terms for 'Terraced Houses', separated by commas>"
+        name: Row Houses
+        terms: "<translate with synonyms or related terms for 'Row Houses', separated by commas>"
       building/train_station: 
         name: Train Station
         terms: "<translate with synonyms or related terms for 'Train Station', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ef03f0086..c64fe9368 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1933,7 +1933,6 @@
         "name": "Barn"
     },
     "building/bunker": {
-        "icon": "building",
         "fields": [
             "address",
             "levels"
@@ -1946,7 +1945,8 @@
         "tags": {
             "building": "bunker"
         },
-        "name": "Bunker"
+        "name": "Bunker",
+        "searchable": false
     },
     "building/cabin": {
         "icon": "building",
@@ -1965,7 +1965,7 @@
         "name": "Cabin"
     },
     "building/cathedral": {
-        "icon": "building",
+        "icon": "place-of-worship",
         "fields": [
             "address",
             "levels"
@@ -1981,7 +1981,7 @@
         "name": "Cathedral"
     },
     "building/chapel": {
-        "icon": "building",
+        "icon": "place-of-worship",
         "fields": [
             "address",
             "levels"
@@ -1997,7 +1997,7 @@
         "name": "Chapel"
     },
     "building/church": {
-        "icon": "building",
+        "icon": "place-of-worship",
         "fields": [
             "address",
             "levels"
@@ -2083,22 +2083,6 @@
         "name": "Entrance",
         "searchable": false
     },
-    "building/farm_auxilary": {
-        "icon": "building",
-        "fields": [
-            "address",
-            "levels"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "tags": {
-            "building": "farm_auxilary"
-        },
-        "name": "Farm Building"
-    },
     "building/garage": {
         "fields": [
             "capacity"
@@ -2145,22 +2129,6 @@
         },
         "name": "Greenhouse"
     },
-    "building/hanger": {
-        "icon": "building",
-        "fields": [
-            "address",
-            "levels"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "tags": {
-            "building": "hanger"
-        },
-        "name": "Hanger"
-    },
     "building/hospital": {
         "icon": "building",
         "fields": [
@@ -2361,7 +2329,7 @@
         "tags": {
             "building": "static_caravan"
         },
-        "name": "Static Caravan"
+        "name": "Static Mobile Home"
     },
     "building/terrace": {
         "icon": "building",
@@ -2377,7 +2345,7 @@
         "tags": {
             "building": "terrace"
         },
-        "name": "Terraced Houses"
+        "name": "Row Houses"
     },
     "building/train_station": {
         "icon": "building",
@@ -2393,7 +2361,8 @@
         "tags": {
             "building": "train_station"
         },
-        "name": "Train Station"
+        "name": "Train Station",
+        "searchable": false
     },
     "building/university": {
         "icon": "building",
@@ -6188,6 +6157,9 @@
     },
     "railway/station": {
         "icon": "rail",
+        "fields": [
+            "building_area"
+        ],
         "geometry": [
             "point",
             "vertex",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index eb3ac79e1..74d51d01f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1334,10 +1334,6 @@
                 "name": "Entrance",
                 "terms": ""
             },
-            "building/farm_auxilary": {
-                "name": "Farm Building",
-                "terms": ""
-            },
             "building/garage": {
                 "name": "Garage",
                 "terms": ""
@@ -1350,10 +1346,6 @@
                 "name": "Greenhouse",
                 "terms": ""
             },
-            "building/hanger": {
-                "name": "Hanger",
-                "terms": ""
-            },
             "building/hospital": {
                 "name": "Hospital Building",
                 "terms": ""
@@ -1403,11 +1395,11 @@
                 "terms": ""
             },
             "building/static_caravan": {
-                "name": "Static Caravan",
+                "name": "Static Mobile Home",
                 "terms": ""
             },
             "building/terrace": {
-                "name": "Terraced Houses",
+                "name": "Row Houses",
                 "terms": ""
             },
             "building/train_station": {