diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index 03872c50f6..c66b58f57b 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -344,9 +344,7 @@ void AddFeatureNameIndexPairs(FeaturesVectorTest const & features,
 bool GetStreetIndex(search::MwmContext & ctx, uint32_t featureID, string const & streetName,
                     uint32_t & result)
 {
-  strings::UniString const street = search::GetStreetNameAsKey(streetName);
-
-  bool const hasStreet = !street.empty();
+  bool const hasStreet = !streetName.empty();
   if (hasStreet)
   {
     FeatureType ft;
@@ -354,9 +352,10 @@ bool GetStreetIndex(search::MwmContext & ctx, uint32_t featureID, string const &
 
     using TStreet = search::ReverseGeocoder::Street;
     vector<TStreet> streets;
-    search::ReverseGeocoder::GetNearbyStreets(ctx, feature::GetCenter(ft), streets);
+    search::ReverseGeocoder::GetNearbyStreets(ctx, feature::GetCenter(ft),
+                                              true /* includeSquaresAndSuburbs */, streets);
 
-    auto const res = search::ReverseGeocoder::GetMatchedStreetIndex(street, streets);
+    auto const res = search::ReverseGeocoder::GetMatchedStreetIndex(streetName, streets);
 
     if (res)
     {
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 033b4572c7..d34b2a73d2 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -200,6 +200,20 @@ IsAirportChecker::IsAirportChecker()
   m_types.push_back(c.GetTypeByPath({"aeroway", "aerodrome"}));
 }
 
+IsSquareChecker::IsSquareChecker()
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"place", "square"}));
+}
+
+IsSuburbChecker::IsSuburbChecker()
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"landuse", "residential"}));
+  m_types.push_back(c.GetTypeByPath({"place", "neighbourhood"}));
+  m_types.push_back(c.GetTypeByPath({"place", "suburb"}));
+}
+
 IsStreetChecker::IsStreetChecker()
 {
   // TODO (@y, @m, @vng): this list must be up-to-date with
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 15ae1f8ee2..751d6de52f 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -104,6 +104,22 @@ public:
   DECLARE_CHECKER_INSTANCE(IsAirportChecker);
 };
 
+class IsSquareChecker : public BaseChecker
+{
+  IsSquareChecker();
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsSquareChecker);
+};
+
+class IsSuburbChecker : public BaseChecker
+{
+  IsSuburbChecker();
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsSuburbChecker);
+};
+
 class IsStreetChecker : public BaseChecker
 {
   IsStreetChecker();
diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp
index d1ff0ab62c..9bc79abd07 100644
--- a/indexer/search_string_utils.cpp
+++ b/indexer/search_string_utils.cpp
@@ -282,7 +282,7 @@ string DropLastToken(string const & str)
   return string(str.begin(), iter.base());
 }
 
-UniString GetStreetNameAsKey(string const & name)
+UniString GetStreetNameAsKey(string const & name, bool ignoreStreetSynonyms)
 {
   if (name.empty())
     return UniString();
@@ -294,6 +294,9 @@ UniString GetStreetNameAsKey(string const & name)
     UniString const s = NormalizeAndSimplifyString(*iter);
     ++iter;
 
+    if (ignoreStreetSynonyms && IsStreetSynonym(s))
+      continue;
+
     res.append(s);
   }
 
diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp
index eb2fa303d0..45e65fab18 100644
--- a/indexer/search_string_utils.hpp
+++ b/indexer/search_string_utils.hpp
@@ -71,7 +71,7 @@ bool TokenizeStringAndCheckIfLastTokenIsPrefix(std::string const & s, Tokens & t
 // Chops off the last query token (the "prefix" one) from |str|.
 std::string DropLastToken(std::string const & str);
 
-strings::UniString GetStreetNameAsKey(std::string const & name);
+strings::UniString GetStreetNameAsKey(std::string const & name, bool ignoreStreetSynonyms);
 
 // *NOTE* The argument string must be normalized and simplified.
 bool IsStreetSynonym(strings::UniString const & s);
diff --git a/map/map_tests/address_tests.cpp b/map/map_tests/address_tests.cpp
index b1dc975775..ef1c0a7043 100644
--- a/map/map_tests/address_tests.cpp
+++ b/map/map_tests/address_tests.cpp
@@ -19,7 +19,8 @@ void TestAddress(ReverseGeocoder & coder, ms::LatLon const & ll,
   ReverseGeocoder::Address addr;
   coder.GetNearbyAddress(MercatorBounds::FromLatLon(ll), addr);
 
-  string const key = strings::ToUtf8(GetStreetNameAsKey(addr.m_street.m_name));
+  string const key =
+      strings::ToUtf8(GetStreetNameAsKey(addr.m_street.m_name, false /* ignoreStreetSynonyms */));
 
   TEST_EQUAL(stName, key, (addr));
   TEST_EQUAL(hNumber, addr.m_building.m_name, (addr));
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 4fcb49970e..9b8d07d511 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -742,7 +742,7 @@ double Street::GetPrefixLength(size_t numSegs) const
 void Street::SetName(string const & name)
 {
   m_name = name;
-  m_processedName = strings::ToUtf8(GetStreetNameAsKey(name));
+  m_processedName = strings::ToUtf8(GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */));
 }
 
 void Street::Reverse()
diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp
index edbfe97a4d..048cb77f0e 100644
--- a/search/reverse_geocoder.cpp
+++ b/search/reverse_geocoder.cpp
@@ -36,13 +36,17 @@ m2::RectD GetLookupRect(m2::PointD const & center, double radiusM)
   return MercatorBounds::RectByCenterXYAndSizeInMeters(center, radiusM);
 }
 
-void AddStreet(FeatureType & ft, m2::PointD const & center,
+void AddStreet(FeatureType & ft, m2::PointD const & center, bool includeSquaresAndSuburbs,
                vector<ReverseGeocoder::Street> & streets)
 {
-  if (ft.GetFeatureType() != feature::GEOM_LINE || !ftypes::IsStreetChecker::Instance()(ft))
-  {
+  bool const addAsStreet =
+      ft.GetFeatureType() == feature::GEOM_LINE && ftypes::IsStreetChecker::Instance()(ft);
+  bool const isSquareOrSuburb =
+      ftypes::IsSquareChecker::Instance()(ft) || ftypes::IsSuburbChecker::Instance()(ft);
+  bool const addAsSquareOrSuburb = includeSquaresAndSuburbs && isSquareOrSuburb;
+
+  if (!addAsStreet && !addAsSquareOrSuburb)
     return;
-  }
 
   string name;
   if (!ft.GetName(StringUtf8Multilang::kDefaultCode, name))
@@ -58,11 +62,13 @@ ReverseGeocoder::ReverseGeocoder(DataSource const & dataSource) : m_dataSource(d
 
 // static
 void ReverseGeocoder::GetNearbyStreets(search::MwmContext & context, m2::PointD const & center,
-                                       vector<Street> & streets)
+                                       bool includeSquaresAndSuburbs, vector<Street> & streets)
 {
   m2::RectD const rect = GetLookupRect(center, kLookupRadiusM);
 
-  auto const addStreet = [&center, &streets](FeatureType & ft) { AddStreet(ft, center, streets); };
+  auto const addStreet = [&](FeatureType & ft) {
+    AddStreet(ft, center, includeSquaresAndSuburbs, streets);
+  };
 
   context.ForEachFeature(rect, addStreet);
   sort(streets.begin(), streets.end(), base::LessBy(&Street::m_distanceMeters));
@@ -75,7 +81,7 @@ void ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD cons
   if (mwmHandle.IsAlive())
   {
     search::MwmContext context(move(mwmHandle));
-    GetNearbyStreets(context, center, streets);
+    GetNearbyStreets(context, center, true /* includeSquaresAndSuburbs */, streets);
   }
 }
 
@@ -85,38 +91,57 @@ void ReverseGeocoder::GetNearbyStreets(FeatureType & ft, vector<Street> & street
   GetNearbyStreets(ft.GetID().m_mwmId, feature::GetCenter(ft), streets);
 }
 
+void ReverseGeocoder::GetNearbyStreetsWaysOnly(MwmSet::MwmId const & id, m2::PointD const & center,
+                                               vector<Street> & streets) const
+{
+  MwmSet::MwmHandle mwmHandle = m_dataSource.GetMwmHandleById(id);
+  if (mwmHandle.IsAlive())
+  {
+    search::MwmContext context(move(mwmHandle));
+    GetNearbyStreets(context, center, false /* includeSquaresAndSuburbs */, streets);
+  }
+}
+
 // static
-boost::optional<uint32_t> ReverseGeocoder::GetMatchedStreetIndex(strings::UniString const & keyName,
+boost::optional<uint32_t> ReverseGeocoder::GetMatchedStreetIndex(std::string const & keyName,
                                                                  vector<Street> const & streets)
 {
-  // Find the exact match or the best match in kSimilarityTresholdPercent limit.
-  uint32_t result;
-  size_t minPercent = kSimilarityThresholdPercent + 1;
+  auto matchStreet = [&](bool ignoreStreetSynonyms) -> boost::optional<uint32_t> {
+    // Find the exact match or the best match in kSimilarityTresholdPercent limit.
+    uint32_t result;
+    size_t minPercent = kSimilarityThresholdPercent + 1;
 
-  for (auto const & street : streets)
-  {
-    strings::UniString const actual = GetStreetNameAsKey(street.m_name);
-
-    size_t const editDistance = strings::EditDistance(keyName.begin(), keyName.end(),
-                                                      actual.begin(), actual.end());
-
-    if (editDistance == 0)
-      return street.m_id.m_index;
-
-    if (actual.empty())
-      continue;
-
-    size_t const percent = editDistance * 100 / actual.size();
-    if (percent < minPercent)
+    auto const key = GetStreetNameAsKey(keyName, ignoreStreetSynonyms);
+    for (auto const & street : streets)
     {
-      result = street.m_id.m_index;
-      minPercent = percent;
-    }
-  }
+      strings::UniString const actual = GetStreetNameAsKey(street.m_name, ignoreStreetSynonyms);
 
-  if (minPercent <= kSimilarityThresholdPercent)
+      size_t const editDistance =
+          strings::EditDistance(key.begin(), key.end(), actual.begin(), actual.end());
+
+      if (editDistance == 0)
+        return street.m_id.m_index;
+
+      if (actual.empty())
+        continue;
+
+      size_t const percent = editDistance * 100 / actual.size();
+      if (percent < minPercent)
+      {
+        result = street.m_id.m_index;
+        minPercent = percent;
+      }
+    }
+
+    if (minPercent <= kSimilarityThresholdPercent)
+      return result;
+    return {};
+  };
+
+  auto result = matchStreet(false /* ignoreStreetSynonyms */);
+  if (result)
     return result;
-  return {};
+  return matchStreet(true /* ignoreStreetSynonyms */);
 }
 
 string ReverseGeocoder::GetFeatureStreetName(FeatureType & ft) const
@@ -206,7 +231,8 @@ bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld,
   case HouseToStreetTable::StreetIdType::Index:
   {
     vector<Street> streets;
-    GetNearbyStreets(bld.m_id.m_mwmId, bld.m_center, streets);
+    // Get streets without squares and suburbs for backward compatibility with data.
+    GetNearbyStreetsWaysOnly(bld.m_id.m_mwmId, bld.m_center, streets);
     if (streetId < streets.size())
     {
       addr.m_building = bld;
diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp
index 31ab18f289..f587069819 100644
--- a/search/reverse_geocoder.hpp
+++ b/search/reverse_geocoder.hpp
@@ -68,7 +68,7 @@ public:
 
   /// Returns a feature id of street from |streets| whose name best matches |keyName|
   /// or empty value if the match was not found.
-  static boost::optional<uint32_t> GetMatchedStreetIndex(strings::UniString const & keyName,
+  static boost::optional<uint32_t> GetMatchedStreetIndex(std::string const & keyName,
                                                          std::vector<Street> const & streets);
 
   struct Address
@@ -85,8 +85,10 @@ public:
   friend std::string DebugPrint(Address const & addr);
 
   /// @return Sorted by distance streets vector for the specified MwmId.
+  /// Parameter |includeSquaresAndSuburbs| needed for backward compatibility:
+  /// existing mwms operate on streets without squares and suburbs.
   static void GetNearbyStreets(search::MwmContext & context, m2::PointD const & center,
-                               std::vector<Street> & streets);
+                               bool includeSquaresAndSuburbs, std::vector<Street> & streets);
   void GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center,
                         std::vector<Street> & streets) const;
   void GetNearbyStreets(FeatureType & ft, std::vector<Street> & streets) const;
@@ -110,6 +112,9 @@ public:
   bool GetExactAddress(FeatureType & ft, Address & addr) const;
 
 private:
+  /// Old data compatible method to retrieve nearby streets.
+  void GetNearbyStreetsWaysOnly(MwmSet::MwmId const & id, m2::PointD const & center,
+                                std::vector<Street> & streets) const;
 
   /// Helper class to incapsulate house 2 street table reloading.
   class HouseTable
diff --git a/search/search_tests/house_detector_tests.cpp b/search/search_tests/house_detector_tests.cpp
index 228fffba41..d611f8d437 100644
--- a/search/search_tests/house_detector_tests.cpp
+++ b/search/search_tests/house_detector_tests.cpp
@@ -57,7 +57,7 @@ class CollectStreetIDs
   static bool GetKey(string const & name, string & key)
   {
     TEST(!name.empty(), ());
-    key = strings::ToUtf8(search::GetStreetNameAsKey(name));
+    key = strings::ToUtf8(search::GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */));
 
     if (key.empty())
     {
@@ -336,7 +336,7 @@ namespace
 {
 string GetStreetKey(string const & name)
 {
-  return strings::ToUtf8(search::GetStreetNameAsKey(name));
+  return strings::ToUtf8(search::GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */));
 }
 } // namespace