diff --git a/docker-compose.yml b/docker-compose.yml
index c4b9709..85a63c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
     links:
     - postgres
   import-osm:
-    image: "openmaptiles/import-osm:latest"
+    image: "openmaptiles/import-osm:0.3"
     env_file: .env
     environment:
       DIFF_MODE: ${DIFF_MODE}
diff --git a/layers/boundary/mapping.yaml b/layers/boundary/mapping.yaml
index 5eee06e..81b0a89 100644
--- a/layers/boundary/mapping.yaml
+++ b/layers/boundary/mapping.yaml
@@ -37,9 +37,10 @@ tables:
       name: admin_level
       type: integer
     filters:
-      exclude_tags:
-      - [ "admin_level", "__nil__" ]
-      - [ "natural", "coastline" ]
+      reject:
+        natural:  ["coastline"]
+      require:
+        admin_level: ["__any__"]
     mapping:
       boundary:
       - administrative
diff --git a/layers/building/mapping.yaml b/layers/building/mapping.yaml
index 49783d9..27ad924 100644
--- a/layers/building/mapping.yaml
+++ b/layers/building/mapping.yaml
@@ -42,8 +42,10 @@ tables:
       - terminal
       - hangar
     filters:
-      exclude_tags:
-      - [ "building", "no" ]
-      - [ "building", "none" ]
-      - [ "building", "No" ]
+      # exclude_tags:
+      # - [ "building", "no" ]
+      # - [ "building", "none" ]
+      # - [ "building", "No" ]
+      reject:
+        building: ["no","none","No"]    
     type: polygon
diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
index 57cbce2..5c7afa1 100644
--- a/layers/place/mapping.yaml
+++ b/layers/place/mapping.yaml
@@ -56,8 +56,8 @@ tables:
     - *name
     - *name_en
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - continent
@@ -82,8 +82,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - country
@@ -110,8 +110,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - island
@@ -136,8 +136,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - island
@@ -171,8 +171,8 @@ tables:
       type: string
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - state
@@ -206,8 +206,8 @@ tables:
       type: string
     - *rank
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - city
diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index 4d31fb0..d1ba1a5 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -57,8 +57,8 @@ tables:
       key: waterway
       type: string
     filters:
-      exclude_tags:
-      - [ "covered", "yes" ]
+      reject:
+        covered: ["yes"]
     mapping:
       landuse:
       - reservoir
diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml
index 15476d8..ecab8bf 100644
--- a/layers/water_name/mapping.yaml
+++ b/layers/water_name/mapping.yaml
@@ -20,8 +20,8 @@ tables:
       key: rank
       type: integer
     filters:
-      exclude_tags:
-      - [ "name", "__nil__" ]
+      require:
+        name: ["__any__"]
     mapping:
       place:
       - ocean