diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql
index 4a579c1..5effd7a 100644
--- a/layers/transportation/layer.sql
+++ b/layers/transportation/layer.sql
@@ -113,7 +113,7 @@ indoor INT) AS $$
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
             NULL::boolean AS is_ford,
             NULL::boolean AS is_ramp, NULL::int AS is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_highway_linestring_gen2
         WHERE zoom_level BETWEEN 9 AND 10
@@ -128,7 +128,7 @@ indoor INT) AS $$
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
             NULL::boolean AS is_ford,
             NULL::boolean AS is_ramp, NULL::int AS is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_highway_linestring_gen1
         WHERE zoom_level = 11
@@ -143,9 +143,7 @@ indoor INT) AS $$
             highway, NULL AS railway, NULL AS aerialway, NULL AS shipway,
             public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            CASE WHEN highway IN ('footway', 'steps') THEN layer
-                ELSE NULL::int
-            END AS layer,
+            layer,
             CASE WHEN highway IN ('footway', 'steps') THEN "level"
                 ELSE NULL::int
             END AS "level",
@@ -188,7 +186,7 @@ indoor INT) AS $$
             NULL::boolean AS is_bridge, NULL::boolean AS is_tunnel,
             NULL::boolean AS is_ford,
             NULL::boolean AS is_ramp, NULL::int AS is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_railway_linestring_gen4
         WHERE zoom_level = 9
@@ -201,7 +199,7 @@ indoor INT) AS $$
             NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_railway_linestring_gen3
         WHERE zoom_level = 10
@@ -214,7 +212,7 @@ indoor INT) AS $$
             NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_railway_linestring_gen2
         WHERE zoom_level = 11
@@ -227,7 +225,7 @@ indoor INT) AS $$
             NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_railway_linestring_gen1
         WHERE zoom_level = 12
@@ -241,7 +239,7 @@ indoor INT) AS $$
             NULL AS highway, railway, NULL AS aerialway, NULL AS shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_railway_linestring
         WHERE zoom_level = 13
@@ -255,7 +253,7 @@ indoor INT) AS $$
             NULL AS highway, NULL as railway, aerialway, NULL AS shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_aerialway_linestring_gen1
         WHERE zoom_level = 12
@@ -268,7 +266,7 @@ indoor INT) AS $$
             NULL AS highway, NULL as railway, aerialway, NULL AS shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_aerialway_linestring
         WHERE zoom_level >= 13
@@ -280,7 +278,7 @@ indoor INT) AS $$
             NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_shipway_linestring_gen2
         WHERE zoom_level = 11
@@ -292,7 +290,7 @@ indoor INT) AS $$
             NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_shipway_linestring_gen1
         WHERE zoom_level = 12
@@ -305,7 +303,7 @@ indoor INT) AS $$
             NULL AS highway, NULL AS railway, NULL AS aerialway, shipway,
             NULL AS public_transport, service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway,
-            NULL::int AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_shipway_linestring
         WHERE zoom_level >= 13
@@ -325,9 +323,7 @@ indoor INT) AS $$
                 ELSE FALSE
             END AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford,
             FALSE AS is_ramp, FALSE::int AS is_oneway,
-            CASE WHEN man_made IN ('bridge') THEN layer
-                ELSE NULL::int
-            END AS layer, NULL::int AS level, NULL::boolean AS indoor,
+            layer, NULL::int AS level, NULL::boolean AS indoor,
             z_order
         FROM osm_highway_polygon
         -- We do not want underground pedestrian areas for now