diff --git a/data/presets.yaml b/data/presets.yaml
index 46d9724b3..c4d91cf5c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -367,6 +367,11 @@ en:
         label: Building
         # 'terms: structure'
         terms: '[translate with synonyms or related terms for ''Building'', separated by commas]'
+      building/flats:
+        # 'building:flats=*'
+        label: Units
+        # building/flats field placeholder
+        placeholder: '2, 4, 6, 8...'
       building/levels:
         # 'building:levels=*'
         label: Levels
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 0bb7b5947..8c1c654dc 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -57,6 +57,7 @@
   "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"},
   "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": ["area"], "label": "Building"},
   "building": {"key": "building", "type": "combo", "label": "Building", "terms": ["structure"]},
+  "building/flats": {"key": "building:flats", "type": "number", "minValue": 0, "label": "Units", "placeholder": "2, 4, 6, 8..."},
   "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
   "building/levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
   "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6...", "terms": ["basement levels"]},
diff --git a/data/presets/fields/building.json b/data/presets/fields/building.json
index 5d9e7bc95..d560638e8 100644
--- a/data/presets/fields/building.json
+++ b/data/presets/fields/building.json
@@ -5,4 +5,4 @@
     "terms": [
         "structure"
     ]
-}
+}
\ No newline at end of file
diff --git a/data/presets/fields/building/flats.json b/data/presets/fields/building/flats.json
new file mode 100644
index 000000000..513f2c912
--- /dev/null
+++ b/data/presets/fields/building/flats.json
@@ -0,0 +1,7 @@
+{
+    "key": "building:flats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Units",
+    "placeholder": "2, 4, 6, 8..."
+}
\ No newline at end of file
diff --git a/data/presets/fields/capacity.json b/data/presets/fields/capacity.json
index 54d242027..16b2e1f51 100644
--- a/data/presets/fields/capacity.json
+++ b/data/presets/fields/capacity.json
@@ -4,4 +4,4 @@
     "minValue": 0,
     "label": "Capacity",
     "placeholder": "50, 100, 200..."
-}
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index bd1e7c5c2..a310ae9d1 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", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
+  "building/apartments": {"icon": "maki-building", "fields": ["{building}", "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 608709d26..7c0da5f77 100644
--- a/data/presets/presets/building/apartments.json
+++ b/data/presets/presets/building/apartments.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-building",
+    "fields": [
+        "{building}",
+        "building/flats"
+    ],
     "geometry": [
         "area"
     ],
@@ -8,4 +12,4 @@
     },
     "matchScore": 0.5,
     "name": "Apartment Building"
-}
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index cc22dabb4..cfac27e1a 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1390,6 +1390,7 @@
     {"key": "boules", "description": "🄵 Type"},
     {"key": "brand", "description": "🄵 Brand"},
     {"key": "brewery", "description": "🄵 Draft Beers"},
+    {"key": "building:flats", "description": "🄵 Units"},
     {"key": "building:levels", "description": "🄵 Building Levels, 🄵 Levels"},
     {"key": "building:levels:underground", "description": "🄵 Underground Levels"},
     {"key": "building:material", "description": "🄵 Material"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f607ed289..fbffc07f9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3070,6 +3070,10 @@
                     "label": "Building",
                     "terms": "structure"
                 },
+                "building/flats": {
+                    "label": "Units",
+                    "placeholder": "2, 4, 6, 8..."
+                },
                 "building/levels_building": {
                     "label": "Building Levels",
                     "terms": "",