diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 688cc5b78..f0e04009d 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -340,7 +340,6 @@ def_poi_fields: &poi_fields
     type: string
   - name: tags
     type: hstore_tags
-    load_all: true
   - name: subclass
     type: mapping_value
   - name: mapping_key
@@ -406,3 +405,6 @@ tables:
     type: polygon
     columns: *poi_fields
     mapping: *poi_mapping
+
+tags:
+  include: [aerodrome, opening_hours, cuisine, organic, zero_waste, bulk_purchase, operator]
\ No newline at end of file