diff --git a/data/subtypes.csv b/data/subtypes.csv
index e3afd1a65..db1e0e78c 100644
--- a/data/subtypes.csv
+++ b/data/subtypes.csv
@@ -1,3 +1,9 @@
 Types;Related Subtypes
 amenity|charging_station;amenity|charging_station|motorcar,amenity|charging_station|motorcycle,amenity|charging_station|bicycle,amenity|charging_station|small,amenity|charging_station|carless
-amenity|bench;amenity|bench|backless
\ No newline at end of file
+amenity|bench;amenity|bench|backless
+buoy|lateral|port,spherical_buoy|lateral|port,beacon|lateral|port;lateral|port
+buoy|lateral|starboard,spherical_buoy|lateral|starboard,beacon|lateral|starboard;lateral|starboard
+buoy|cardinal|east,spherical_buoy|cardinal|east,beacon|cardinal|east;cardinal|east
+buoy|cardinal|west,spherical_buoy|cardinal|west,beacon|cardinal|west;cardinal|west
+buoy|cardinal|south,spherical_buoy|cardinal|south,beacon|cardinal|south;cardinal|south
+buoy|cardinal|north,spherical_buoy|cardinal|north,beacon|cardinal|north;cardinal|north
\ No newline at end of file
diff --git a/libs/indexer/feature_visibility.cpp b/libs/indexer/feature_visibility.cpp
index ad309f24f..e8cad4d74 100644
--- a/libs/indexer/feature_visibility.cpp
+++ b/libs/indexer/feature_visibility.cpp
@@ -148,8 +148,6 @@ bool TypeAlwaysExists(uint32_t type, GeomType geomType = GeomType::Undefined)
         cl.GetTypeByPath({"internet_access"}),
         cl.GetTypeByPath({"toilets"}),
         cl.GetTypeByPath({"drinking_water"}),
-        cl.GetTypeByPath({"lateral"}),
-        cl.GetTypeByPath({"cardinal"}),
     };
     if (base::IsExist(arrTypes, type))
       return true;
diff --git a/libs/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp
index 63aab23f2..295e11679 100644
--- a/libs/indexer/ftypes_matcher.cpp
+++ b/libs/indexer/ftypes_matcher.cpp
@@ -746,13 +746,6 @@ IsPublicTransportStopChecker::IsPublicTransportStopChecker()
   m_types.push_back(c.GetTypeByPath({"railway", "tram_stop"}));
 }
 
-IsDirectionalChecker::IsDirectionalChecker() : ftypes::BaseChecker(1 /* level */)
-{
-  Classificator const & c = classif();
-  m_types.push_back(c.GetTypeByPath({"cardinal"}));
-  m_types.push_back(c.GetTypeByPath({"lateral"}));
-}
-
 IsCharingStationCarChecker::IsCharingStationCarChecker() : ftypes::BaseChecker(3 /* level */)
 {
   Classificator const & c = classif();
diff --git a/libs/indexer/ftypes_matcher.hpp b/libs/indexer/ftypes_matcher.hpp
index f36dac6ed..cb1eb175c 100644
--- a/libs/indexer/ftypes_matcher.hpp
+++ b/libs/indexer/ftypes_matcher.hpp
@@ -511,14 +511,6 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPublicTransportStopChecker);
 };
 
-class IsDirectionalChecker : public ftypes::BaseChecker
-{
-  IsDirectionalChecker();
-
-public:
-  DECLARE_CHECKER_INSTANCE(IsDirectionalChecker);
-};
-
 class IsCharingStationCarChecker : public ftypes::BaseChecker
 {
   IsCharingStationCarChecker();
diff --git a/libs/indexer/map_object.cpp b/libs/indexer/map_object.cpp
index 63e21e324..b26fd3180 100644
--- a/libs/indexer/map_object.cpp
+++ b/libs/indexer/map_object.cpp
@@ -121,7 +121,6 @@ std::string MapObject::GetLocalizedAllTypes(bool withMainType) const
 
   auto const & isPoi = ftypes::IsPoiChecker::Instance();
   auto const & subtypes = ftypes::Subtypes::Instance();
-  auto const & isDirectional = ftypes::IsDirectionalChecker::Instance();
   auto const & amenityChecker = ftypes::IsAmenityChecker::Instance();
   auto const & charingStationCarChecker = ftypes::IsCharingStationCarChecker::Instance();
   auto const & charingStationCarlessChecker = ftypes::IsCharingStationCarlessChecker::Instance();
@@ -143,7 +142,7 @@ std::string MapObject::GetLocalizedAllTypes(bool withMainType) const
     }
 
     // Ignore types that are not POI
-    if (!isMainType && !isPoi(type) && !subtypes.IsTypeWithSubtypesOrSubtype(type) && !isDirectional(type))
+    if (!isMainType && !isPoi(type) && !subtypes.IsTypeWithSubtypesOrSubtype(type))
       continue;
 
     // Ignore general amenity