diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
index ebd8ae43f4..cd8feabf7f 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
@@ -21,7 +21,6 @@ using namespace routing::turns;
   _targetDistance = @(info.m_distToTarget.c_str());
   _targetUnits = @(info.m_targetUnitsSuffix.c_str());
   _progress = info.m_completionPercent;
-  auto & f = GetFramework();
   CLLocation * lastLocation = [MWMLocationManager lastLocation];
   if (lastLocation && [MWMRouter type] == MWMRouterTypePedestrian)
   {
diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm
index 4274ba5abf..f111451ac8 100644
--- a/iphone/Maps/Core/Location/MWMLocationManager.mm
+++ b/iphone/Maps/Core/Location/MWMLocationManager.mm
@@ -332,7 +332,6 @@ void setPermissionRequested()
   MWMLocationManager * manager = [self manager];
   [manager.predictor setMyPositionMode:mode];
   [manager processLocationStatus:manager.lastLocationStatus];
-  auto const & f = GetFramework();
   if ([MWMRouter isRoutingActive])
   {
     switch ([MWMRouter type])
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 0804ff6f7d..c471a7541c 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -968,7 +968,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
               kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage)
             }
                 atLocation:location];
-      GetFramework().CreateNote(m_mapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist,
+      GetFramework().CreateNote(self->m_mapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist,
                                 additional);
       [self backTap];
       [self showDropDown];
diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm
index 29e882a10c..3f1d3b42c2 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@@ -412,6 +412,8 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) {
                                                     userInfo:@{
                                                       kSearchStateKey : @(state)
                                                     }];
+  if (_state == MWMSearchManagerStateHidden)
+    [self endSearch];
   _state = state;
   [self updateTopController];
   switch (state)
diff --git a/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewProtocol.h b/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewProtocol.h
index 27efb1932f..f7fe3863f8 100644
--- a/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewProtocol.h
+++ b/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewProtocol.h
@@ -3,7 +3,6 @@
 @required
 
 - (void)searchText:(NSString *)text forInputLocale:(NSString *)locale;
-- (void)tapMyPositionFromHistory;
 - (void)dismissKeyboard;
 
 @end