diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 9a9920e660..166c3d712b 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -779,7 +779,11 @@ IsCapitalChecker::IsCapitalChecker() : BaseChecker(3 /* level */)
 IsPublicTransportStopChecker::IsPublicTransportStopChecker()
 {
   Classificator const & c = classif();
+  /// @todo Add bus station into _major_ class (like IsRailwayStationChecker)?
+  m_types.push_back(c.GetTypeByPath({"amenity", "bus_station"}));
+  m_types.push_back(c.GetTypeByPath({"amenity", "ferry_terminal"}));
   m_types.push_back(c.GetTypeByPath({"highway", "bus_stop"}));
+  m_types.push_back(c.GetTypeByPath({"railway", "halt"}));
   m_types.push_back(c.GetTypeByPath({"railway", "tram_stop"}));
 }
 
diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
index 3cf5b1dfd9..46651f5864 100644
--- a/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -319,8 +319,9 @@ UNIT_CLASS_TEST(MwmTestsFixture, Hamburg_Park)
   NameStartsWith(range, {"Heide Park", "Heide-Park"});
   TEST_LESS(SortedByDistance(range, center).first, 100000, ());
 
-  EqualClassifType(Range(results, 4, 6), GetClassifTypes({
+  EqualClassifType(Range(results, 4, 7), GetClassifTypes({
       {"highway", "service"},
+      {"railway", "halt"},
       {"highway", "bus_stop"},
   }));
 }