diff --git a/routing_common/bicycle_model.cpp b/routing_common/bicycle_model.cpp
index 45db54340f..ec3f3ce922 100644
--- a/routing_common/bicycle_model.cpp
+++ b/routing_common/bicycle_model.cpp
@@ -166,11 +166,13 @@ VehicleModel::LimitsInitList UkraineOptions()
 }
 
 VehicleModel::SurfaceInitList const kBicycleSurface = {
-  // {{surfaceType, surfaceType}, {weightFactor, etaFactor}}
+  // {{surfaceType}, {weightFactor, etaFactor}}
   {{"psurface", "paved_good"}, {1.0, 1.0}},
   {{"psurface", "paved_bad"}, {0.8, 0.8}},
   {{"psurface", "unpaved_good"}, {1.0, 1.0}},
-  {{"psurface", "unpaved_bad"}, {0.3, 0.3}}
+  {{"psurface", "unpaved_bad"}, {0.3, 0.3}},
+  // no dedicated cycleway, doesn't mean that bicycle is not allowed, just lower weight
+  {{"hwtag", "nocycleway"}, {0.8, 0.8}},
 };
 }  // namespace bicycle_model
 
diff --git a/routing_common/pedestrian_model.cpp b/routing_common/pedestrian_model.cpp
index 5863135fbe..2d29fe4b0f 100644
--- a/routing_common/pedestrian_model.cpp
+++ b/routing_common/pedestrian_model.cpp
@@ -123,11 +123,13 @@ VehicleModel::LimitsInitList YesBridleway(VehicleModel::LimitsInitList res = kDe
 }
 
 VehicleModel::SurfaceInitList const kPedestrianSurface = {
-  // {{surfaceType, surfaceType}, {weightFactor, etaFactor}}
+  // {{surfaceType}, {weightFactor, etaFactor}}
   {{"psurface", "paved_good"}, {1.0, 1.0}},
   {{"psurface", "paved_bad"}, {1.0, 1.0}},
   {{"psurface", "unpaved_good"}, {1.0, 1.0}},
-  {{"psurface", "unpaved_bad"}, {0.8, 0.8}}
+  {{"psurface", "unpaved_bad"}, {0.8, 0.8}},
+  // no dedicated sidewalk, doesn't mean that foot is not allowed, just lower weight
+  {{"hwtag", "nosidewalk"}, {0.8, 0.8}},
 };
 }  // namespace pedestrian_model
 
diff --git a/routing_common/routing_common_tests/vehicle_model_test.cpp b/routing_common/routing_common_tests/vehicle_model_test.cpp
index 17fa403b41..9bc0dfb9dc 100644
--- a/routing_common/routing_common_tests/vehicle_model_test.cpp
+++ b/routing_common/routing_common_tests/vehicle_model_test.cpp
@@ -1,9 +1,11 @@
 #include "testing/testing.hpp"
 
+#include "routing_common/bicycle_model.hpp"
+#include "routing_common/car_model.hpp"
 #include "routing_common/car_model_coefs.hpp"
 #include "routing_common/maxspeed_conversion.hpp"
+#include "routing_common/pedestrian_model.hpp"
 #include "routing_common/vehicle_model.hpp"
-#include "routing_common/car_model.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
@@ -13,6 +15,7 @@
 
 #include "base/math.hpp"
 
+
 namespace vehicle_model_test
 {
 using namespace routing;
@@ -76,6 +79,8 @@ public:
 
   uint32_t primary, secondary, secondaryTunnel, secondaryBridge, residential;
   uint32_t oneway, pavedGood, pavedBad, unpavedGood, unpavedBad;
+
+  static SpeedParams DefaultParams() { return {{}, kInvalidSpeed, false /* inCity */}; }
 };
 
 class VehicleModelStub : public VehicleModel
@@ -241,7 +246,8 @@ namespace
 bool LessSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
 {
   TEST(l.IsValid() && r.IsValid(), (l, r));
-  return l.m_weight < r.m_weight && l.m_eta < r.m_eta;
+  // Weight should be strict less, ETA may be equal.
+  return l.m_weight < r.m_weight && l.m_eta <= r.m_eta;
 }
 
 #define TEST_LESS_SPEED(l, r) TEST(LessSpeed(l, r), (l, r))
@@ -250,8 +256,9 @@ bool LessSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
 UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
 {
   auto const & model = CarModel::AllLimitsInstance();
-
   auto const & c = classif();
+  auto const p = DefaultParams();
+
   feature::TypesHolder h1;
   h1.Add(c.GetTypeByPath({"highway", "track"}));
 
@@ -263,17 +270,86 @@ UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
   // Obvious that gravel tertiary (moreover with maxspeed=60kmh) should be better than track.
 
   {
-    SpeedParams p1({}, kInvalidSpeed, false /* inCity */);
     SpeedParams p2({measurement_utils::Units::Metric, 60, 60}, kInvalidSpeed, false /* inCity */);
-    TEST_LESS_SPEED(model.GetTypeSpeed(h1, p1), model.GetTypeSpeed(h2, p2));
+    TEST_LESS_SPEED(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p2));
   }
 
   {
-    SpeedParams p({}, kInvalidSpeed, false /* inCity */);
     TEST_LESS_SPEED(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p));
   }
 }
 
+UNIT_CLASS_TEST(VehicleModelTest, CarModel_Smoke)
+{
+  auto const & model = CarModel::AllLimitsInstance();
+  auto const & c = classif();
+  auto const p = DefaultParams();
+
+  feature::TypesHolder h1;
+  h1.Add(secondary);
+
+  feature::TypesHolder h2;
+  h2.Add(secondary);
+  h2.Add(c.GetTypeByPath({"hwtag", "yescar"}));
+
+  feature::TypesHolder h3;
+  h3.Add(c.GetTypeByPath({"highway", "tertiary"}));
+
+  TEST_EQUAL(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p), ());
+  TEST_LESS_SPEED(model.GetTypeSpeed(h3, p), model.GetTypeSpeed(h2, p));
+}
+
+UNIT_CLASS_TEST(VehicleModelTest, BicycleModel_Smoke)
+{
+  auto const & model = BicycleModel::AllLimitsInstance();
+  auto const & c = classif();
+  auto const p = DefaultParams();
+
+  feature::TypesHolder h1;
+  h1.Add(c.GetTypeByPath({"highway", "cycleway"}));
+  h1.Add(c.GetTypeByPath({"hwtag", "yesbicycle"}));
+
+  feature::TypesHolder h2;
+  h2.Add(c.GetTypeByPath({"highway", "cycleway"}));
+
+  feature::TypesHolder h3;
+  h3.Add(secondary);
+  h3.Add(c.GetTypeByPath({"hwtag", "yesbicycle"}));
+
+  feature::TypesHolder h4;
+  h4.Add(secondary);
+
+  feature::TypesHolder h5;
+  h5.Add(secondary);
+  h5.Add(c.GetTypeByPath({"hwtag", "nocycleway"}));
+
+  TEST_EQUAL(model.GetTypeSpeed(h1, p), model.GetTypeSpeed(h2, p), ());
+  TEST_LESS_SPEED(model.GetTypeSpeed(h3, p), model.GetTypeSpeed(h2, p));
+  TEST_LESS_SPEED(model.GetTypeSpeed(h4, p), model.GetTypeSpeed(h3, p));
+  TEST_LESS_SPEED(model.GetTypeSpeed(h5, p), model.GetTypeSpeed(h4, p));
+}
+
+UNIT_CLASS_TEST(VehicleModelTest, PedestrianModel_Smoke)
+{
+  auto const & model = PedestrianModel::AllLimitsInstance();
+  auto const & c = classif();
+  auto const p = DefaultParams();
+
+  feature::TypesHolder h1;
+  h1.Add(residential);
+  h1.Add(c.GetTypeByPath({"hwtag", "yesfoot"}));
+
+  feature::TypesHolder h2;
+  h2.Add(residential);
+
+  feature::TypesHolder h3;
+  h3.Add(residential);
+  h3.Add(c.GetTypeByPath({"hwtag", "nosidewalk"}));
+
+  TEST_LESS_SPEED(model.GetTypeSpeed(h2, p), model.GetTypeSpeed(h1, p));
+  TEST_LESS_SPEED(model.GetTypeSpeed(h3, p), model.GetTypeSpeed(h2, p));
+}
+
 #undef TEST_LESS_SPEED
 
 UNIT_TEST(VehicleModel_MultiplicationOperatorTest)