diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 2a4d520bb7..557157119a 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -725,4 +725,23 @@ UNIT_TEST(OsmType_Subway)
     TEST_EQUAL(params.m_Types.size(), 1, (params));
     TEST(params.IsTypeExist(GetType({"railway", "station", "monorail"})), (params));
   }
+
+  {
+    char const * arr[][2] = {
+      { "line",	"Northern, Bakerloo" },
+      { "name",	"Charing Cross" },
+      { "network", "London Underground" },
+      { "operator", "TfL" },
+      { "railway", "station" },
+    };
+
+    XMLElement e;
+    FillXmlElement(arr, ARRAY_SIZE(arr), &e);
+
+    FeatureParams params;
+    ftype::GetNameAndType(&e, params);
+
+    TEST_EQUAL(params.m_Types.size(), 1, (params));
+    TEST(params.IsTypeExist(GetType({"railway", "station", "subway", "london"})), (params));
+  }
 }
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 33c02114f5..f7a2668a58 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -384,7 +384,7 @@ namespace ftype
 
   public:
     enum EType { ENTRANCE, HIGHWAY, ADDRESS, ONEWAY, PRIVATE, LIT, NOFOOT, YESFOOT,
-                 RW_STATION_SUBWAY };
+                 RW_STATION, RW_STATION_SUBWAY };
 
     CachedTypes()
     {
@@ -401,10 +401,12 @@ namespace ftype
       for (auto const & e : arr)
         m_types.push_back(c.GetTypeByPath(e));
 
+      m_types.push_back(c.GetTypeByPath({ "railway", "station" }));
       m_types.push_back(c.GetTypeByPath({ "railway", "station", "subway" }));
     }
 
     uint32_t Get(EType t) const { return m_types[t]; }
+
     bool IsHighway(uint32_t t) const
     {
       ftype::TruncValue(t, 1);
@@ -412,7 +414,10 @@ namespace ftype
     }
     bool IsRwStation(uint32_t t) const
     {
-      // check the exact match with possible types
+      return t == Get(RW_STATION);
+    }
+    bool IsRwSubway(uint32_t t) const
+    {
       ftype::TruncValue(t, 3);
       return t == Get(RW_STATION_SUBWAY);
     }
@@ -494,6 +499,7 @@ namespace ftype
 
     bool highwayDone = false;
     bool subwayDone = false;
+    bool railwayDone = false;
 
     // Get a copy of source types, because we will modify params in the loop;
     FeatureParams::TTypes const vTypes = params.m_Types;
@@ -520,30 +526,41 @@ namespace ftype
         highwayDone = true;
       }
 
-      if (!subwayDone && types.IsRwStation(vTypes[i]))
+      if (!subwayDone && types.IsRwSubway(vTypes[i]))
       {
         TagProcessor(p).ApplyRules(
         {
-          { "network", "London Underground", [&params]() { params.SetRwStationType("london"); }},
-          { "network", "New York City Subway", [&params]() { params.SetRwStationType("newyork"); }},
-          { "network", "Московский метрополитен", [&params]() { params.SetRwStationType("moscow"); }},
-          { "network", "Verkehrsverbund Berlin-Brandenburg", [&params]() { params.SetRwStationType("berlin"); }},
-          { "network", "Минский метрополитен", [&params]() { params.SetRwStationType("minsk"); }},
+          { "network", "London Underground", [&params]() { params.SetRwSubwayType("london"); }},
+          { "network", "New York City Subway", [&params]() { params.SetRwSubwayType("newyork"); }},
+          { "network", "Московский метрополитен", [&params]() { params.SetRwSubwayType("moscow"); }},
+          { "network", "Verkehrsverbund Berlin-Brandenburg", [&params]() { params.SetRwSubwayType("berlin"); }},
+          { "network", "Минский метрополитен", [&params]() { params.SetRwSubwayType("minsk"); }},
 
-          { "network", "Київський метрополітен", [&params]() { params.SetRwStationType("kiev"); }},
-          { "operator", "КП «Київський метрополітен»", [&params]() { params.SetRwStationType("kiev"); }},
+          { "network", "Київський метрополітен", [&params]() { params.SetRwSubwayType("kiev"); }},
+          { "operator", "КП «Київський метрополітен»", [&params]() { params.SetRwSubwayType("kiev"); }},
 
-          { "network", "RATP", [&params]() { params.SetRwStationType("paris"); }},
-          { "network", "Metro de Barcelona", [&params]() { params.SetRwStationType("barcelona"); }},
+          { "network", "RATP", [&params]() { params.SetRwSubwayType("paris"); }},
+          { "network", "Metro de Barcelona", [&params]() { params.SetRwSubwayType("barcelona"); }},
 
-          { "network", "Metro de Madrid", [&params]() { params.SetRwStationType("madrid"); }},
-          { "operator", "Metro de Madrid", [&params]() { params.SetRwStationType("madrid"); }},
+          { "network", "Metro de Madrid", [&params]() { params.SetRwSubwayType("madrid"); }},
+          { "operator", "Metro de Madrid", [&params]() { params.SetRwSubwayType("madrid"); }},
 
-          { "network", "Metropolitana di Roma", [&params]() { params.SetRwStationType("roma"); }},
+          { "network", "Metropolitana di Roma", [&params]() { params.SetRwSubwayType("roma"); }},
+          { "network", "ATAC", [&params]() { params.SetRwSubwayType("roma"); }},
         });
 
         subwayDone = true;
       }
+
+      if (!subwayDone && !railwayDone && types.IsRwStation(vTypes[i]))
+      {
+        TagProcessor(p).ApplyRules(
+        {
+          { "network", "London Underground", [&params]() { params.SetRwSubwayType("london"); }},
+        });
+
+        railwayDone = true;
+      }
     }
 
     params.FinishAddingTypes();
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 408dd381ab..fe859ef5d9 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -280,17 +280,17 @@ uint8_t FeatureParams::GetTypeMask() const
   return m_geomType;
 }
 
-void FeatureParams::SetRwStationType(char const * cityName)
+void FeatureParams::SetRwSubwayType(char const * cityName)
 {
   Classificator const & c = classif();
 
-  static uint32_t const src = c.GetTypeByPath({"railway", "station", "subway"});
+  static uint32_t const src = c.GetTypeByPath({"railway", "station"});
   uint32_t const dest = c.GetTypeByPath({"railway", "station", "subway", cityName});
 
   for (size_t i = 0; i < m_Types.size(); ++i)
   {
     uint32_t t = m_Types[i];
-    ftype::TruncValue(t, 3);
+    ftype::TruncValue(t, 2);
     if (t == src)
     {
       m_Types[i] = dest;
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index 3d140e97b7..7cc4ad05cd 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -243,8 +243,8 @@ public:
   inline void AddType(uint32_t t) { m_Types.push_back(t); }
 
   /// Special function to replace a regular railway station type with
-  /// the special one for the correspondent city.
-  void SetRwStationType(char const * cityName);
+  /// the special subway type for the correspondent city.
+  void SetRwSubwayType(char const * cityName);
 
   /// @param skipType2  Do not accumulate this type if skipType2 != 0.
   /// '2' means 2-level type in classificator tree (also skip child types).