diff --git a/layers/transportation/README.md b/layers/transportation/README.md
index 9c7406c..ee844c8 100644
--- a/layers/transportation/README.md
+++ b/layers/transportation/README.md
@@ -4,8 +4,7 @@
 Read the layer documentation at **http://openmaptiles.org/schema#transportation**
 
 ### Mapping Diagram
-![Mapping diagram for transportation](http://openmaptiles.org/media/mapping_transportation.png)
+![Mapping diagram for transportation](mapping_diagram.png?raw=true)
 
 ### ETL diagram
-![ETL diagram for transportation](http://openmaptiles.org/media/etl_transportation.png)
-
+![ETL diagram for transportation](etl_diagram.png?raw=true)
diff --git a/layers/transportation/etl_diagram.png b/layers/transportation/etl_diagram.png
new file mode 100644
index 0000000..2593ca3
Binary files /dev/null and b/layers/transportation/etl_diagram.png differ
diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql
index 1b50d60..bd2fcad 100644
--- a/layers/transportation/layer.sql
+++ b/layers/transportation/layer.sql
@@ -4,7 +4,7 @@ $$ LANGUAGE SQL IMMUTABLE STRICT;
 
 
 -- etldoc: layer_transportation[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="<sql> layer_transportation |<z4z6> z4-z6 |<z7z8> z7-z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
+-- etldoc:     label="<sql> layer_transportation |<z4> z4 |<z5z6> z5-z6 |<z7> z7 |<z8> z8 |<z9z10> z9-z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
 CREATE OR REPLACE FUNCTION layer_transportation(bbox geometry, zoom_level int)
 RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
     SELECT
@@ -42,7 +42,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
         WHERE zoom_level BETWEEN 5 AND 6
         UNION ALL
 
-        -- etldoc: osm_highway_linestring_gen4  ->  layer_transportation:z7z8
+        -- etldoc: osm_highway_linestring_gen4  ->  layer_transportation:z7
         SELECT
             osm_id, geometry, highway, NULL AS railway, NULL AS service,
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
@@ -53,7 +53,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
         WHERE zoom_level = 7
         UNION ALL
 
-        -- etldoc: osm_highway_linestring_gen3  ->  layer_transportation:z9
+        -- etldoc: osm_highway_linestring_gen3  ->  layer_transportation:z8
         SELECT
             osm_id, geometry, highway, NULL AS railway, NULL AS service,
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
@@ -64,7 +64,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
         WHERE zoom_level = 8
         UNION ALL
 
-        -- etldoc: osm_highway_linestring_gen2  ->  layer_transportation:z10
+        -- etldoc: osm_highway_linestring_gen2  ->  layer_transportation:z9z10
         SELECT
             osm_id, geometry, highway, NULL AS railway, NULL AS service,
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
@@ -104,7 +104,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
         )
         UNION ALL
 
-        -- etldoc: osm_railway_linestring_gen2  ->  layer_transportation:z11"
+        -- etldoc: osm_railway_linestring_gen2  ->  layer_transportation:z11
         SELECT
             osm_id, geometry, NULL AS highway, railway,
             service_value(service) AS service,
@@ -113,7 +113,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
         WHERE zoom_level = 11 AND (railway='rail' AND service = '')
         UNION ALL
 
-        -- etldoc: osm_railway_linestring_gen1  ->  layer_transportation:z12"
+        -- etldoc: osm_railway_linestring_gen1  ->  layer_transportation:z12
         SELECT
             osm_id, geometry, NULL AS highway, railway,
             service_value(service) AS service,
diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml
index a0e9cf9..59b02a8 100644
--- a/layers/transportation/mapping.yaml
+++ b/layers/transportation/mapping.yaml
@@ -222,7 +222,7 @@ tables:
       - pedestrian
 
 # TODO: Future table for joining networks
-# etldoc: imposm3 -> osm_route_member -> "!!!todo:Networks!!!"
+# etldoc: imposm3 -> osm_route_member
   route_member:
     type: relation_member
     columns:
diff --git a/layers/transportation/mapping_diagram.png b/layers/transportation/mapping_diagram.png
new file mode 100644
index 0000000..0794592
Binary files /dev/null and b/layers/transportation/mapping_diagram.png differ