diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 24a44eceac..7fbcc4b6df 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -208,7 +208,7 @@ IsPostPoiChecker::IsPostPoiChecker()
 IsOperatorOthersPoiChecker::IsOperatorOthersPoiChecker()
 {
   Classificator const & c = classif();
-  for (char const * val : {"bicycle_rental", "bureau_de_change", "car_sharing", "car_rental", "fuel", "charging_station", 
+  for (char const * val : {"bicycle_rental", "bureau_de_change", "car_sharing", "car_rental", "fuel", "charging_station",
                            "parking", "motorcycle_parking", "bicycle_parking", "payment_terminal", "university", "vending_machine"})
     m_types.push_back(c.GetTypeByPath({"amenity", val}));
 }
@@ -713,6 +713,12 @@ IsPublicTransportStopChecker::IsPublicTransportStopChecker()
   m_types.push_back(c.GetTypeByPath({"railway", "tram_stop"}));
 }
 
+IsTaxiChecker::IsTaxiChecker()
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"amenity", "taxi"}));
+}
+
 IsMotorwayJunctionChecker::IsMotorwayJunctionChecker()
 {
   m_types.push_back(classif().GetTypeByPath({"highway", "motorway_junction"}));
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 0255bb5695..164bfc462a 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -449,6 +449,13 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPublicTransportStopChecker);
 };
 
+class IsTaxiChecker : public BaseChecker
+{
+  IsTaxiChecker();
+public:
+  DECLARE_CHECKER_INSTANCE(IsTaxiChecker);
+};
+
 class IsMotorwayJunctionChecker : public BaseChecker
 {
   IsMotorwayJunctionChecker();
diff --git a/search/ranking_info.cpp b/search/ranking_info.cpp
index f7890a9608..f227ed6c78 100644
--- a/search/ranking_info.cpp
+++ b/search/ranking_info.cpp
@@ -223,7 +223,6 @@ public:
       {"amenity", "police"},
       {"amenity", "post_office"},
       {"amenity", "stripclub"},
-      {"amenity", "taxi"},
       {"amenity", "theatre"},
     };
 
@@ -496,7 +495,7 @@ PoiType GetPoiType(feature::TypesHolder const & th)
   {
     return PoiType::TransportMajor;
   }
-  if (IsPublicTransportStopChecker::Instance()(th))
+  if (IsPublicTransportStopChecker::Instance()(th) || IsTaxiChecker::Instance()(th))
     return PoiType::TransportLocal;
 
   static IsAttraction const attractionCheck;