diff --git a/data/presets.yaml b/data/presets.yaml
index bc65ba26f..695ac6e40 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -954,11 +954,6 @@ en:
       flag/type:
         # 'flag:type=*'
         label: Flag Type
-      flats:
-        # flats=*
-        label: Flats
-        # flats field placeholder
-        placeholder: '2, 4, 6, 8...'
       floating:
         # floating=*
         label: Floating
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 79e26b86a..2adf66076 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -172,7 +172,6 @@
   "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
   "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true, "terms": ["help request"]},
   "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
-  "flats": {"key": "flats", "type": "number", "minValue": 0, "label": "Flats", "placeholder": "2, 4, 6, 8..."},
   "floating": {"key": "floating", "type": "check", "label": "Floating"},
   "flood_prone": {"key": "flood_prone", "type": "check", "label": "Flood Prone"},
   "ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
diff --git a/data/presets/fields/flats.json b/data/presets/fields/flats.json
deleted file mode 100644
index 1e6624581..000000000
--- a/data/presets/fields/flats.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "key": "flats",
-    "type": "number",
-    "minValue": 0,
-    "label": "Flats",
-    "placeholder": "2, 4, 6, 8..."
-}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d0d0df5c9..8dacfe549 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -339,7 +339,7 @@
   "building/bunker": {"icon": "temaki-bunker", "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
   "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
   "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
-  "building/apartments": {"icon": "maki-building", "fields": ["{building}", "flats"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
+  "building/apartments": {"icon": "maki-building", "fields": ["building/flats"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
   "building/barn": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
   "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
   "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
diff --git a/data/presets/presets/building/apartments.json b/data/presets/presets/building/apartments.json
index cc00f75e1..e526b2d42 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -1,8 +1,7 @@
 {
     "icon": "maki-building",
     "fields": [
-        "{building}",
-        "flats"
+        "building/flats"
     ],
     "geometry": [
         "area"
diff --git a/data/taginfo.json b/data/taginfo.json
index 02e9d0803..4bd1c4afb 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1538,7 +1538,6 @@
     {"key": "fitness_station", "description": "🄵 Equipment Type"},
     {"key": "fixme", "description": "🄵 Fix Me"},
     {"key": "flag:type", "description": "🄵 Flag Type"},
-    {"key": "flats", "description": "🄵 Flats"},
     {"key": "floating", "description": "🄵 Floating"},
     {"key": "flood_prone", "description": "🄵 Flood Prone"},
     {"key": "fountain", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1c8b3f8b9..d957e7b57 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3580,10 +3580,6 @@
                 "flag/type": {
                     "label": "Flag Type"
                 },
-                "flats": {
-                    "label": "Flats",
-                    "placeholder": "2, 4, 6, 8..."
-                },
                 "floating": {
                     "label": "Floating"
                 },