diff --git a/search/pre_ranker.cpp b/search/pre_ranker.cpp
index 4d932973f1..3794003e7e 100644
--- a/search/pre_ranker.cpp
+++ b/search/pre_ranker.cpp
@@ -246,16 +246,15 @@ void PreRanker::FilterForViewportSearch()
   {
     auto const & info = result.GetInfo();
 
-    // Interesting, is it possible when there is no center for a search result?
     ASSERT(info.m_centerLoaded, (result.GetId()));
-    if (!info.m_centerLoaded || !m_params.m_viewport.IsPointInside(info.m_center))
+    if (!m_params.m_viewport.IsPointInside(info.m_center))
       return true;
 
     /// @todo Make some upper bound like for regular search, but not to erase partially matched results?
     return result.GetMatchedTokensNumber() + 1 < m_params.m_numQueryTokens;
   });
 
-  /// @todo Comment next statements to discard viewport filtering (displacement) at all.
+  // By VNG: Comment next statements to discard viewport filtering (displacement) for Debug purpose.
   SweepNearbyResults(m_params.m_minDistanceOnMapBetweenResults, m_prevEmit, m_results);
 
   for (auto const & result : m_results)
diff --git a/search/ranker.cpp b/search/ranker.cpp
index 620b922b1b..aed0779d14 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -869,6 +869,8 @@ void Ranker::LoadCountriesTree() { m_regionInfoGetter.LoadCountriesTree(); }
 
 void Ranker::MakeRankerResults()
 {
+  bool const isViewportMode = m_geocoderParams.m_mode == Mode::Viewport;
+
   RankerResultMaker maker(*this, m_dataSource, m_infoGetter, m_reverseGeocoder, m_geocoderParams);
   for (auto const & r : m_preRankerResults)
   {
@@ -876,17 +878,10 @@ void Ranker::MakeRankerResults()
     if (!p)
       continue;
 
-    if (m_geocoderParams.m_mode == Mode::Viewport &&
-        !m_geocoderParams.m_pivot.IsPointInside(p->GetCenter()))
-    {
-      continue;
-    }
+    ASSERT(!isViewportMode || m_geocoderParams.m_pivot.IsPointInside(p->GetCenter()), (r));
 
-    /// @todo Do not filter "equal" results by distance in Mode::Viewport mode.
-    /// Strange when (for example bus stops) not all results are highlighted.
-    /// @todo Is it ok to make duplication check for O(N) here?
-    /// Especially when we make RemoveDuplicatingLinear later.
-    if (!ResultExists(*p, m_tentativeResults, m_params.m_minDistanceBetweenResultsM))
+    /// @todo Is it ok to make duplication check for O(N) here? Especially when we make RemoveDuplicatingLinear later.
+    if (isViewportMode || !ResultExists(*p, m_tentativeResults, m_params.m_minDistanceBetweenResultsM))
       m_tentativeResults.push_back(move(*p));
   };