diff --git a/search/features_layer_matcher.cpp b/search/features_layer_matcher.cpp
index e310deaad8..d5704ea769 100644
--- a/search/features_layer_matcher.cpp
+++ b/search/features_layer_matcher.cpp
@@ -84,14 +84,6 @@ FeaturesLayerMatcher::TStreets const & FeaturesLayerMatcher::GetNearbyStreetsImp
 
   auto & streets = entry.first;
   m_reverseGeocoder.GetNearbyStreets(feature, streets);
-  for (size_t i = 0; i < streets.size(); ++i)
-  {
-    if (streets[i].m_distanceMeters > ReverseGeocoder::kLookupRadiusM)
-    {
-      streets.resize(i);
-      break;
-    }
-  }
 
   return streets;
 }
@@ -116,7 +108,7 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreetImpl(uint32_t houseId, FeatureTy
   result = kInvalidId;
 
   FeatureID streetId;
-  if (!edited && m_reverseGeocoder.GetStreetByHouse(houseFeature.GetID(), streetId))
+  if (!edited && m_reverseGeocoder.GetStreetByHouse(houseFeature, streetId))
   {
     result = streetId.m_index;
     return result;
diff --git a/search/features_layer_matcher.hpp b/search/features_layer_matcher.hpp
index 166aa477a8..325450622d 100644
--- a/search/features_layer_matcher.hpp
+++ b/search/features_layer_matcher.hpp
@@ -329,8 +329,6 @@ private:
       if (street.IsEmpty())
         continue;
 
-      auto const & calculator = *street.m_calculator;
-
       for (uint32_t houseId : street.m_features)
       {
         FeatureType feature;
@@ -341,20 +339,8 @@ private:
         if (!loaded && !GetByIndex(houseId, feature))
           continue;
 
-        // Best geometry is used here as feature::GetCenter(feature)
-        // actually modifies internal state of a |feature| by caching
-        // it's geometry. So, when GetMatchingStreet(houseId, feature)
-        // is called, high precision geometry is used again to compute
-        // |feature|'s center, and this is a right behavior as
-        // house-to-street table was generated by using high-precision
-        // centers of features.
-        m2::PointD const center = feature::GetCenter(feature);
-        if (calculator.GetProjection(center, proj) &&
-            proj.m_distMeters <= ReverseGeocoder::kLookupRadiusM &&
-            GetMatchingStreet(houseId, feature) == streetId)
-        {
+        if (GetMatchingStreet(houseId, feature) == streetId)
           fn(houseId, streetId);
-        }
       }
     }
   }
diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp
index 048cb77f0e..9fdbd5d588 100644
--- a/search/reverse_geocoder.cpp
+++ b/search/reverse_geocoder.cpp
@@ -160,15 +160,11 @@ string ReverseGeocoder::GetOriginalFeatureStreetName(FeatureType & ft) const
   return addr.m_street.m_name;
 }
 
-bool ReverseGeocoder::GetStreetByHouse(FeatureID const & houseId, FeatureID & streetId) const
+bool ReverseGeocoder::GetStreetByHouse(FeatureType & house, FeatureID & streetId) const
 {
   Address addr;
   HouseTable table(m_dataSource);
-  Building building;
-  m_dataSource.ReadFeature(
-      [&](FeatureType & ft) { building = FromFeature(ft, 0.0 /* distMeters */); }, houseId);
-
-  if (GetNearbyAddress(table, building, false /* ignoreEdits */, addr))
+  if (GetNearbyAddress(table, FromFeature(house, 0.0 /* distMeters */), false /* ignoreEdits */, addr))
   {
     streetId = addr.m_street.m_id;
     return true;
diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp
index f587069819..006c174212 100644
--- a/search/reverse_geocoder.hpp
+++ b/search/reverse_geocoder.hpp
@@ -100,7 +100,7 @@ public:
   std::string GetOriginalFeatureStreetName(FeatureType & ft) const;
   /// For |houseId| with street information sets |streetId| to FeatureID of street corresponding to
   /// |houseId| and returns true. Returs false otherwise.
-  bool GetStreetByHouse(FeatureID const & houseId, FeatureID & streetId) const;
+  bool GetStreetByHouse(FeatureType & house, FeatureID & streetId) const;
 
   /// @return The nearest exact address where building has house number and valid street match.
   void GetNearbyAddress(m2::PointD const & center, Address & addr) const;
@@ -112,10 +112,6 @@ 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
   {
@@ -130,6 +126,10 @@ private:
     MwmSet::MwmHandle m_handle;
   };
 
+  /// Old data compatible method to retrieve nearby streets.
+  void GetNearbyStreetsWaysOnly(MwmSet::MwmId const & id, m2::PointD const & center,
+                                std::vector<Street> & streets) const;
+
   /// Ignores changes from editor if |ignoreEdits| is true.
   bool GetNearbyAddress(HouseTable & table, Building const & bld, bool ignoreEdits,
                         Address & addr) const;