diff --git a/layers/aeroway/etl_diagram.png b/layers/aeroway/etl_diagram.png
index ae03ee2..c2b3818 100644
Binary files a/layers/aeroway/etl_diagram.png and b/layers/aeroway/etl_diagram.png differ
diff --git a/layers/aeroway/layer.sql b/layers/aeroway/layer.sql
index 9ca030f..c182a62 100644
--- a/layers/aeroway/layer.sql
+++ b/layers/aeroway/layer.sql
@@ -1,15 +1,31 @@
 -- etldoc: layer_aeroway[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_aeroway |<z11> z11|<z12> z12|<z13> z13|<z14_> z14+" ];
+-- etldoc:     label="layer_aeroway |<z10> z10|<z11> z11|<z12> z12|<z13> z13|<z14_> z14+" ];
 
 CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int)
 RETURNS TABLE(geometry geometry, class text, ref text) AS $$
     SELECT geometry, aeroway AS class, ref FROM (
-        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z11
-        -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z12
+        -- etldoc:  osm_aeroway_linestring_gen3 -> layer_aeroway:z10
+        SELECT geometry, aeroway, ref
+        FROM osm_aeroway_linestring_gen3 WHERE zoom_level = 10
+        UNION ALL
+        -- etldoc:  osm_aeroway_linestring_gen2 -> layer_aeroway:z11
+        SELECT geometry, aeroway, ref
+        FROM osm_aeroway_linestring_gen2 WHERE zoom_level = 11
+        UNION ALL
+        -- etldoc:  osm_aeroway_linestring_gen1 -> layer_aeroway:z12
+        SELECT geometry, aeroway, ref
+        FROM osm_aeroway_linestring_gen1 WHERE zoom_level = 12
+        UNION ALL
         -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z13
         -- etldoc:  osm_aeroway_linestring -> layer_aeroway:z14_
         SELECT geometry, aeroway, ref
-        FROM osm_aeroway_linestring WHERE zoom_level >= 11
+        FROM osm_aeroway_linestring WHERE zoom_level >= 13
+        UNION ALL
+
+        -- etldoc:  osm_aeroway_polygon_gen3 -> layer_aeroway:z10
+        -- etldoc:  osm_aeroway_polygon_gen3 -> layer_aeroway:z11
+        SELECT geometry, aeroway, ref
+        FROM osm_aeroway_polygon_gen3 WHERE zoom_level BETWEEN 10 AND 11
         UNION ALL
         -- etldoc:  osm_aeroway_polygon_gen2 -> layer_aeroway:z12
         SELECT geometry, aeroway, ref
diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml
index 9a9b6c7..d67e9f6 100644
--- a/layers/aeroway/mapping.yaml
+++ b/layers/aeroway/mapping.yaml
@@ -1,4 +1,19 @@
 generalized_tables:
+  # etldoc: imposm3 -> osm_aeroway_linestring_gen3
+  aeroway_linestring_gen3:
+    source: aeroway_linestring_gen2
+    tolerance: ZRES11
+
+  # etldoc: imposm3 -> osm_aeroway_linestring_gen2
+  aeroway_linestring_gen2:
+    source: aeroway_linestring_gen1
+    tolerance: ZRES12
+
+  # etldoc: imposm3 -> osm_aeroway_linestring_gen1
+  aeroway_linestring_gen1:
+    source: aeroway_linestring
+    tolerance: ZRES13
+
   # etldoc: imposm3 -> osm_aeroway_polygon_gen3
   aeroway_polygon_gen3:
     source: aeroway_polygon_gen2