diff --git a/layers/transportation/highway_name.sql b/layers/transportation/highway_name.sql
index d7d16b7..0588645 100644
--- a/layers/transportation/highway_name.sql
+++ b/layers/transportation/highway_name.sql
@@ -6,7 +6,6 @@ SELECT hstore(string_agg(nullif(slice_language_tags(tags ||
                        'name:en', CASE WHEN length(name_en) > 15 THEN osml10n_street_abbrev_en(name_en) ELSE NULLIF(name_en, '') END,
                        'name:de', CASE WHEN length(name_de) > 15 THEN osml10n_street_abbrev_de(name_de) ELSE NULLIF(name_de, '') END
                      ]))::text,
-                     ''), ','))
-                     || get_basic_names(tags, geometry);
+                     ''), ','));
 $$ LANGUAGE SQL IMMUTABLE
                 PARALLEL SAFE;
diff --git a/layers/transportation/update_transportation_merge.sql b/layers/transportation/update_transportation_merge.sql
index 6c0de7e..3f78112 100644
--- a/layers/transportation/update_transportation_merge.sql
+++ b/layers/transportation/update_transportation_merge.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS osm_transportation_name_network AS
 SELECT
     geometry,
     osm_id,
-    tags,
+    tags || get_basic_names(tags, geometry) AS tags,
     ref,
     highway,
     subclass,
diff --git a/layers/transportation_name/update_transportation_name.sql b/layers/transportation_name/update_transportation_name.sql
index 126c38b..472ac9b 100644
--- a/layers/transportation_name/update_transportation_name.sql
+++ b/layers/transportation_name/update_transportation_name.sql
@@ -8,7 +8,7 @@
 -- etldoc: osm_aerialway_linestring ->  osm_transportation_name_linestring
 CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS
 SELECT (ST_Dump(geometry)).geom AS geometry,
-       tags,
+       tags || get_basic_names(tags, geometry) AS tags,
        ref,
        highway,
        subclass,
@@ -278,7 +278,7 @@ BEGIN
     SELECT
         geometry,
         osm_id,
-        tags,
+        tags || get_basic_names(tags, geometry) AS tags,
         ref,
         highway,
         subclass,
@@ -493,7 +493,7 @@ BEGIN
 
     INSERT INTO osm_transportation_name_linestring
     SELECT (ST_Dump(geometry)).geom AS geometry,
-           tags,
+           tags|| get_basic_names(tags, geometry) AS tags,
            ref,
            highway,
            subclass,