diff --git a/layers/transportation_name/layer.sql b/layers/transportation_name/layer.sql
index 01d0c9c..0cfb45a 100644
--- a/layers/transportation_name/layer.sql
+++ b/layers/transportation_name/layer.sql
@@ -72,15 +72,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
           highway,
           network,
           z_order,
-          CASE WHEN highway IN ('footway', 'steps') THEN layer
-              ELSE NULL::int
-          END AS layer,
-          CASE WHEN highway IN ('footway', 'steps') THEN "level"
-              ELSE NULL::int
-          END AS "level",
-          CASE WHEN highway IN ('footway', 'steps') THEN indoor
-              ELSE NULL::boolean
-          END AS indoor
+          layer,
+          "level",
+          indoor
         FROM osm_transportation_name_linestring
         WHERE zoom_level = 12
             AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
@@ -100,15 +94,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
           highway,
           network,
           z_order,
-          CASE WHEN highway IN ('footway', 'steps') THEN layer
-              ELSE NULL::int
-          END AS layer,
-          CASE WHEN highway IN ('footway', 'steps') THEN "level"
-              ELSE NULL::int
-          END AS "level",
-          CASE WHEN highway IN ('footway', 'steps') THEN indoor
-              ELSE NULL::boolean
-          END AS indoor
+          layer,
+          "level",
+          indoor
         FROM osm_transportation_name_linestring
         WHERE zoom_level = 13
             AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
@@ -127,15 +115,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text,
           highway,
           network,
           z_order,
-          CASE WHEN highway IN ('footway', 'steps') THEN layer
-              ELSE NULL::int
-          END AS layer,
-          CASE WHEN highway IN ('footway', 'steps') THEN "level"
-              ELSE NULL::int
-          END AS "level",
-          CASE WHEN highway IN ('footway', 'steps') THEN indoor
-              ELSE NULL::boolean
-          END AS indoor
+          layer,
+          "level",
+          indoor
         FROM osm_transportation_name_linestring
         WHERE zoom_level >= 14
 
diff --git a/layers/transportation_name/update_transportation_name.sql b/layers/transportation_name/update_transportation_name.sql
index 4dc01e6..9d5a6c0 100644
--- a/layers/transportation_name/update_transportation_name.sql
+++ b/layers/transportation_name/update_transportation_name.sql
@@ -23,9 +23,15 @@ CREATE MATERIALIZED VIEW osm_transportation_name_network AS (
         else hl.ref
       end as ref,
       hl.highway,
-      hl.level,
-      hl.layer,
-      hl.indoor,
+      CASE WHEN highway IN ('footway', 'steps') THEN layer
+          ELSE NULL::int
+      END AS layer,
+      CASE WHEN highway IN ('footway', 'steps') THEN "level"
+          ELSE NULL::int
+      END AS "level",
+      CASE WHEN highway IN ('footway', 'steps') THEN indoor
+          ELSE NULL::boolean
+      END AS indoor,
       ROW_NUMBER() OVER(PARTITION BY hl.osm_id
                                    ORDER BY rm.network_type) AS "rank",
       hl.z_order