diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 916a86d38e..4878a414cf 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -54,6 +54,7 @@ public:
 
     m_map[c.GetTypeByPath({"highway", "service"})] = ftypes::HighwayClass::Service;
     m_map[c.GetTypeByPath({"highway", "track"})] = ftypes::HighwayClass::Service;
+    m_map[c.GetTypeByPath({"highway", "busway"})] = ftypes::HighwayClass::Service;
     m_map[c.GetTypeByPath({"man_made", "pier"})] = ftypes::HighwayClass::Service;
 
     m_map[c.GetTypeByPath({"highway", "pedestrian"})] = ftypes::HighwayClass::Pedestrian;
@@ -144,9 +145,10 @@ bool BaseChecker::IsMatched(uint32_t type) const
   return (find(m_types.begin(), m_types.end(), PrepareToMatch(type, m_level)) != m_types.end());
 }
 
-void BaseChecker::ForEachType(function<void(uint32_t)> && fn) const
+void BaseChecker::ForEachType(function<void(uint32_t)> const & fn) const
 {
-  for_each(m_types.cbegin(), m_types.cend(), move(fn));
+  for (auto const & t : m_types)
+    fn(t);
 }
 
 bool BaseChecker::operator()(feature::TypesHolder const & types) const
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 30b3e1ec9f..6a47e28e15 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -9,10 +9,8 @@
 #include <functional>
 #include <limits>
 #include <optional>
-#include <set>
 #include <string>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
 #define DECLARE_CHECKER_INSTANCE(CheckerType) static CheckerType const & Instance() { \
@@ -26,12 +24,12 @@ protected:
   uint8_t const m_level;
   std::vector<uint32_t> m_types;
 
-  BaseChecker(uint8_t level = 2) : m_level(level) {}
+  explicit BaseChecker(uint8_t level = 2) : m_level(level) {}
   virtual ~BaseChecker() = default;
 
 public:
   virtual bool IsMatched(uint32_t type) const;
-  virtual void ForEachType(std::function<void(uint32_t)> && fn) const;
+  virtual void ForEachType(std::function<void(uint32_t)> const & fn) const;
 
   std::vector<uint32_t> const & GetTypes() const { return m_types; }
 
diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp
index 818fd15eba..ae34bd47f5 100644
--- a/routing_common/vehicle_model.cpp
+++ b/routing_common/vehicle_model.cpp
@@ -385,6 +385,7 @@ string DebugPrint(HighwayType type)
   case HighwayType::HighwaySecondaryLink: return "highway-secondary_link";
   case HighwayType::RouteFerry: return "route-ferry";
   case HighwayType::HighwayTertiaryLink: return "highway-tertiary_link";
+  case HighwayType::HighwayBusway: return "highway-busway";
   case HighwayType::RailwayRailMotorVehicle: return "railway-rail-motor_vehicle";
   case HighwayType::RouteShuttleTrain: return "route-shuttle_train";
   }
diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp
index 0c36741e2c..33ab35a295 100644
--- a/routing_common/vehicle_model.hpp
+++ b/routing_common/vehicle_model.hpp
@@ -54,6 +54,7 @@ enum class HighwayType : uint16_t
   HighwaySecondaryLink = 176,
   RouteFerry = 259,
   HighwayTertiaryLink = 272,
+  HighwayBusway = 858,    // reserve type here, but this type is not used for any routing by default
   RailwayRailMotorVehicle = 994,
   RouteShuttleTrain = 1054,
 };