diff --git a/map/displacement_mode_manager.cpp b/map/displacement_mode_manager.cpp
index 2135274563..46ce5d5d79 100644
--- a/map/displacement_mode_manager.cpp
+++ b/map/displacement_mode_manager.cpp
@@ -16,7 +16,10 @@ void DisplacementModeManager::Set(Slot slot, bool show)
   else
     m_mask = mask & ~bit;
 
-  if (mask == m_mask)
+  // We are only intersected in states "mask is zero" and "mask is not
+  // zero". Therefore, do nothing if the new state is the same as the
+  // previous state.
+  if ((mask == 0) == (m_mask == 0))
     return;
 
   if (m_mask != 0)
diff --git a/map/framework.cpp b/map/framework.cpp
index 0aad67a9a3..35b720d862 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1071,29 +1071,31 @@ void Framework::InvalidateRect(m2::RectD const & rect)
 
 void Framework::StartInteractiveSearch(search::SearchParams const & params)
 {
-  auto const onResults = params.m_onResults;
+  auto const originalOnResults = params.m_onResults;
+
+  auto setMode = [this]() {
+    SetDisplacementMode(DisplacementModeManager::SLOT_INTERACTIVE_SEARCH, true /* show */);
+  };
+
+  auto onResults = [this, originalOnResults](search::Results const & results) {
+    if (!results.IsEndMarker())
+    {
+      GetPlatform().RunOnGuiThread([this, results]() {
+        if (IsInteractiveSearchActive())
+          FillSearchResultsMarks(results);
+      });
+    }
+
+    if (originalOnResults)
+      originalOnResults(results);
+  };
 
   m_lastInteractiveSearchParams = params;
   m_lastInteractiveSearchParams.SetForceSearch(false);
   m_lastInteractiveSearchParams.SetMode(search::Mode::Viewport);
   m_lastInteractiveSearchParams.SetSuggestsEnabled(false);
-
-  m_lastInteractiveSearchParams.m_onResults = search::InteractiveSearchCallback(
-      [this]() {
-        SetDisplacementMode(DisplacementModeManager::SLOT_INTERACTIVE_SEARCH, true /* show */);
-      } /* setMode */,
-      [this, onResults](search::Results const & results) {
-        if (!results.IsEndMarker())
-        {
-          GetPlatform().RunOnGuiThread([this, results]() {
-            if (IsInteractiveSearchActive())
-              FillSearchResultsMarks(results);
-          });
-        }
-
-        if (onResults)
-          onResults(results);
-      } /* onResults */);
+  m_lastInteractiveSearchParams.m_onResults =
+      search::InteractiveSearchCallback(move(setMode), move(onResults));
 
   UpdateUserViewportChanged();
 }
diff --git a/search/hotels_classifier.hpp b/search/hotels_classifier.hpp
index 65a8501208..1619a5c746 100644
--- a/search/hotels_classifier.hpp
+++ b/search/hotels_classifier.hpp
@@ -6,7 +6,7 @@ namespace search
 {
 class Results;
 
-// A binary classifier, that can be used in conjunction with search
+// A binary classifier that can be used in conjunction with search
 // engine to decide whether the majority of results are hotels or not.
 //
 // *NOTE* This class is NOT thread safe.
diff --git a/search/result.hpp b/search/result.hpp
index e3912d9f31..e541c9b1f4 100644
--- a/search/result.hpp
+++ b/search/result.hpp
@@ -42,7 +42,6 @@ public:
 
     osm::YesNoUnknown m_isOpenNow = osm::Unknown;  // Valid for any result.
 
-    // True if the struct is already assigned or need to be calculated otherwise.
     bool m_isInitialized = false;
   };