diff --git a/layers/building/building.sql b/layers/building/building.sql
index 29aca8f..4efd65d 100644
--- a/layers/building/building.sql
+++ b/layers/building/building.sql
@@ -60,8 +60,8 @@ CREATE OR REPLACE VIEW osm_all_buildings AS (
          osm_building_street WHERE role = 'house' AND ST_GeometryType(geometry) = 'ST_Polygon'
          UNION ALL
 
-         -- etldoc: osm_building_multipolygon -> layer_building:z14_
-         -- Buildings that are inner/outer
+         -- etldoc: osm_building_polygon -> layer_building:z14_
+         -- Buildings that are from multipolygons
          SELECT osm_id,geometry,
                   COALESCE(nullif(as_numeric(height),-1),nullif(as_numeric(buildingheight),-1)) as height,
                   COALESCE(nullif(as_numeric(min_height),-1),nullif(as_numeric(buildingmin_height),-1)) as min_height,
@@ -71,7 +71,9 @@ CREATE OR REPLACE VIEW osm_all_buildings AS (
                   nullif(colour, '') AS colour,
                   FALSE as hide_3d
          FROM
-         osm_building_polygon obp WHERE EXISTS (SELECT 1 FROM osm_building_multipolygon obm WHERE obp.osm_id = obm.osm_id)
+         osm_building_polygon obp
+         WHERE osm_id < 0
+
          UNION ALL
          -- etldoc: osm_building_polygon -> layer_building:z14_
          -- Standalone buildings
diff --git a/layers/building/etl_diagram.png b/layers/building/etl_diagram.png
index 8a43f94..274a8b5 100644
Binary files a/layers/building/etl_diagram.png and b/layers/building/etl_diagram.png differ
diff --git a/layers/building/mapping.yaml b/layers/building/mapping.yaml
index d2f9693..8c2bf7c 100644
--- a/layers/building/mapping.yaml
+++ b/layers/building/mapping.yaml
@@ -342,76 +342,3 @@ tables:
     mapping:
       type: [building]
     type: relation_member
-
-  # etldoc: imposm3 -> osm_building_multipolygon
-  building_multipolygon:
-    columns:
-    - name: osm_id
-      type: id
-    - name: geometry
-      type: validated_geometry
-    - name: area
-      type: area
-    - name: building
-      key: building
-      type: string
-      from_member: true
-    - name: material
-      key: building:material
-      type: string
-    - name: colour
-      key: building:colour
-      type: string
-    - name: buildingpart
-      key: building:part
-      type: string
-      from_member: true
-    - name: buildingheight
-      key: building:height
-      type: string
-      from_member: true
-    - name: height
-      key: height
-      type: string
-      from_member: true
-    - name: buildingmin_height
-      key: building:min_height
-      type: string
-      from_member: true
-    - name: min_height
-      key: min_height
-      type: string
-      from_member: true
-    - name: buildinglevels
-      key: building:levels
-      type: string
-      from_member: true
-    - name: levels
-      key: levels
-      type: string
-      from_member: true
-    - name: buildingmin_level
-      key: building:min_level
-      type: string
-      from_member: true
-    - name: min_level
-      key: min_level
-      type: string
-      from_member: true
-    - name: member
-      type: member_id
-    - name: index
-      type: member_index
-    - name: role
-      type: member_role
-      from_member: true
-    - name: type
-      type: member_type
-    mapping:
-      type: [multipolygon]
-    filters:
-      reject:
-        building: ["no","none","No"]
-        building:part: ["no","none","No"]
-        man_made: ["bridge"]
-    type: relation_member
diff --git a/layers/building/mapping_diagram.png b/layers/building/mapping_diagram.png
index 8d8341f..9a6ef60 100644
Binary files a/layers/building/mapping_diagram.png and b/layers/building/mapping_diagram.png differ