diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
index c7c4e5093..0f6aadb87 100644
--- a/layers/place/mapping.yaml
+++ b/layers/place/mapping.yaml
@@ -89,6 +89,7 @@ tables:
     mapping:
       place:
       - island
+      - islet
 
   # etldoc: imposm3 -> osm_island_point
   island_point:
diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 7de861c2f..e963ab366 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -405,6 +405,3 @@ tables:
     type: polygon
     columns: *poi_fields
     mapping: *poi_mapping
-
-tags:
-  load_all: true
diff --git a/openmaptiles_base.yaml b/openmaptiles_base.yaml
index 6f5e1abf5..4deaa1da4 100644
--- a/openmaptiles_base.yaml
+++ b/openmaptiles_base.yaml
@@ -13,6 +13,7 @@ tileset:
     - layers/transportation_name/transportation_name.yaml
     - layers/place/place.yaml
     - layers/aerodrome_label/aerodrome_label.yaml
+    - layers/housenumber/housenumber.yaml
   name: OpenMapTiles
   version: 3.3.0
   id: openmaptiles
diff --git a/openmaptiles_poi.yaml b/openmaptiles_poi.yaml
index 9edf7ac00..ef97d0a21 100644
--- a/openmaptiles_poi.yaml
+++ b/openmaptiles_poi.yaml
@@ -1,6 +1,11 @@
 tileset:
   layers:
+    - layers/water/water.yaml
+    - layers/place/place.yaml
+    - layers/waterway/waterway.yaml
+    - layers/water_name/water_name.yaml
     - layers/poi/poi.yaml
+    - layers/aerodrome_label/aerodrome_label.yaml
   name: OpenMapTiles
   version: 3.3.0
   id: openmaptiles