diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 44e9a0236b..474ed91c58 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -933,8 +933,9 @@ railway|rail|tourism|bridge;[railway=rail][usage=tourism][!service][bridge?];;na
 railway|rail|highspeed|tunnel;[railway=rail][highspeed?][!service][tunnel?];;name;int_name;854;
 railway|rail|tourism|tunnel;[railway=rail][usage=tourism][!service][tunnel?];;name;int_name;855;
 mapswithme|grid;856;
-highway|service|busway;[highway=service][service=busway];;name;int_name;857;
-highway|busway;858;
+# service=bus/busway is deprecated in OSM
+deprecated:highway|service|busway:10.2023;[highway=service][service=busway];x;name;int_name;857;highway|busway
+highway|busway;[highway=busway],[highway=service][service=busway],[highway=service][service=bus];;name;int_name;858;
 highway|busway|bridge;[highway=busway][bridge?];;name;int_name;859;
 highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860;
 natural|salt_pond;861;landuse|salt_pond
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index 9edd2d9d2f..a07471d4f7 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -255,7 +255,6 @@ highway-busway-tunnel                               # line z15- (also has pathte
 highway-service                                     # line z15- (also has pathtext z16-)
 highway-service-area                                # line z15- (also has pathtext z16-)
 highway-service-bridge                              # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z16-)
-highway-service-busway                              # line z15- (also has pathtext z16-)
 highway-service-driveway                            # line z16- (also has pathtext z16-)
 highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
 highway-service-tunnel                              # line z15- (also has pathtext z16-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 446bdc5cbd..5887032ef6 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -765,7 +765,6 @@ highway-path-tunnel                                 # pathtext z15- (also has li
 highway-service                                     # pathtext z16- (also has line z15-)
 highway-service-area                                # pathtext z16- (also has line z15-)
 highway-service-bridge                              # pathtext z16- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-service-busway                              # pathtext z16- (also has line z15-)
 highway-service-driveway                            # pathtext z16- (also has line z16-)
 highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
 highway-service-tunnel                              # pathtext z16- (also has line z15-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index d7c8e2d714..b82320305e 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -230,7 +230,6 @@ railway-subway-bridge                               # line z13- (also has line::
 highway-service                                     # line z14- (also has pathtext z16-)
 highway-service-area                                # line z14- (also has pathtext z16-)
 highway-service-bridge                              # line z14- (also has pathtext z16-)
-highway-service-busway                              # line z14- (also has pathtext z16-)
 highway-service-driveway                            # line z15- (also has pathtext z16-)
 highway-service-parking_aisle                       # line z14- (also has pathtext z16-)
 highway-service-tunnel                              # line z14- (also has pathtext z16-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index c5ffddfd7e..8955279291 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -299,7 +299,6 @@ landuse-forest-deciduous                            # icon z12- (also has captio
 landuse-forest-mixed                                # icon z12- (also has caption(optional) z12-, area z10-)
 === 2200
 
-highway-service-busway                              # pathtext z16- (also has line z14-)
 highway-service-driveway                            # pathtext z16- (also has line z15-)
 highway-service-parking_aisle                       # pathtext z16- (also has line z14-)
 === 2150
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index a06841f183..b22a54a49e 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1954,6 +1954,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"emergency", "fire_hydrant"},
     {"emergency", "phone"},
     {"highway", "bridleway"},
+    {"highway", "busway"},
     {"highway", "bus_stop"},
     {"highway", "construction"},
     {"highway", "cycleway"},
@@ -2392,6 +2393,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"highway", "bridleway", "bridge"}, {{"highway", "bridleway"}, {"bridge", "any_value"}}},
     {{"highway", "bridleway", "permissive"}, {{"highway", "bridleway"}, {"access", "permissive"}}},
     {{"highway", "bridleway", "tunnel"}, {{"highway", "bridleway"}, {"tunnel", "any_value"}}},
+    {{"highway", "busway"}, {{"highway", "service"}, {"service", "bus"}}},
+    {{"highway", "busway"}, {{"highway", "service"}, {"service", "busway"}}},
+    {{"highway", "busway", "bridge"}, {{"highway", "busway"}, {"bridge", "any_value"}}},
+    {{"highway", "busway", "tunnel"}, {{"highway", "busway"}, {"tunnel", "any_value"}}},
     {{"highway", "cycleway", "bridge"}, {{"highway", "cycleway"}, {"bridge", "any_value"}}},
     {{"highway", "cycleway", "permissive"}, {{"highway", "cycleway"}, {"access", "permissive"}}},
     {{"highway", "cycleway", "tunnel"}, {{"highway", "cycleway"}, {"tunnel", "any_value"}}},
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index c041289df9..fc71307071 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -338,7 +338,6 @@ void LeaveLongestTypes(vector<generator::TypeStrings> & matchedTypes)
         return lhs.size() > rhs.size();
     }
 
-    // Default less order for sort, doesn't matter here.
     return lhs < rhs;
   };
 
@@ -371,12 +370,27 @@ void MatchTypes(OsmElement * p, FeatureBuilderParams & params, function<bool(uin
 
   LeaveLongestTypes(matchedTypes);
 
-  for (auto const & path : matchedTypes)
-  {
-    uint32_t const t = classif().GetTypeByPath(path);
+  auto const & cl = classif();
 
-    if (filterType(t))
-      params.AddType(t);
+  bool buswayAdded = false;
+  for (size_t i = 0; i < matchedTypes.size(); ++i)
+  {
+    auto const & path = matchedTypes[i];
+    uint32_t const type = cl.GetTypeByPath(path);
+    if (!filterType(type))
+      continue;
+
+    // "busway" and "service" can be matched together, keep busway only.
+    if (path[0] == "highway")
+    {
+      // busway goes before service, see LeaveLongestTypes.isBetter
+      if (path[1] == "busway")
+        buswayAdded = true;
+      else if (buswayAdded && path[1] == "service")
+        continue;
+    }
+
+    params.AddType(type);
   }
 }
 
diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp
index e30f965b19..280eb66438 100644
--- a/generator/osm_element.cpp
+++ b/generator/osm_element.cpp
@@ -202,3 +202,8 @@ base::GeoObjectId GetGeoObjectId(OsmElement const & element)
   }
   UNREACHABLE();
 }
+
+std::string DebugPrintID(OsmElement const & e)
+{
+  return (e.m_type != OsmElement::EntityType::Unknown) ? DebugPrint(GetGeoObjectId(e)) : std::string("Unknown");
+}
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index da826bca12..b8d8c731f2 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -170,6 +170,7 @@ struct OsmElement
 };
 
 base::GeoObjectId GetGeoObjectId(OsmElement const & element);
+std::string DebugPrintID(OsmElement const & element);
 
 std::string DebugPrint(OsmElement const & element);
 std::string DebugPrint(OsmElement::EntityType type);
diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp
index 304b605fd9..1fbcbf76c6 100644
--- a/indexer/indexer_tests/checker_test.cpp
+++ b/indexer/indexer_tests/checker_test.cpp
@@ -79,7 +79,7 @@ UNIT_TEST(IsBridgeOrTunnelChecker)
   base::StringIL arrNo[] =
   {
     {"highway", "motorway_junction"},
-    {"highway", "service", "busway"},
+    {"highway", "service", "driveway"},
   };
   for (auto const & e : arrNo)
     TEST(!ftypes::IsBridgeOrTunnelChecker::Instance()(c.GetTypeByPath(e)), ());