diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index 75975d8962..6b5cff6913 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -112,6 +112,10 @@ extern NSString * const kAlohalyticsTapEventKey;
 - (MWMAlertViewController *)alertController { return self.ownerController.alertController; }
 - (void)searchViewDidEnterState:(MWMSearchManagerState)state
 {
+  if (state == MWMSearchManagerStateMapSearch)
+  {
+    [self.navigationManager setMapSearch];
+  }
   if (state == MWMSearchManagerStateHidden)
   {
     if (!IPAD || MapsAppDelegate.theApp.routingPlaneMode == MWMRoutingPlaneModeNone)
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
index 654a72a982..19c3ee0d61 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
@@ -90,7 +90,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
 
 - (IBAction)textFieldDidEndEditing:(UITextField *)textField
 {
-  if (textField.text.length == 0)
+  if (textField.text.length == 0 && self.state != MWMSearchManagerStateHidden)
     [self endSearch];
 }
 
@@ -275,6 +275,15 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
   [self.searchTextField resignFirstResponder];
   self.rootView.compact = YES;
   [MWMSearch setSearchOnMap:YES];
+
+  if ([MWMNavigationDashboardManager manager].state == MWMNavigationDashboardStateNavigation)
+  {
+    self.searchTextField.text = @"";
+    [self.tabbedController resetSelectedTab];
+    self.tableViewController = nil;
+    self.noMapsController = nil;
+    self.rootView.isVisible = NO;
+  }
 }
 
 #pragma mark - Properties
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
index bf7260b740..8e19935986 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
@@ -67,7 +67,6 @@ NSString * identifierForType(MWMSearchTableCellType type)
 {
   [super viewWillDisappear:animated];
   [MWMSearch removeObserver:self];
-  [MWMSearch clear];
 }
 
 - (void)mwm_refreshUI { [self.view mwm_refreshUI]; }
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
index ea549bde14..ca4bc37f42 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
@@ -45,6 +45,7 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) {
 - (void)updateDashboard;
 - (void)setRouteBuilderProgress:(CGFloat)progress;
 - (void)mwm_refreshUI;
+- (void)setMapSearch;
 
 - (void)addInfoDisplay:(id<MWMNavigationDashboardInfoProtocol>)infoDisplay;
 
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 41aedd1546..75db4dcd88 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -138,6 +138,7 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
   [self.routePreview remove];
   self.routePreview = nil;
   [self.navigationInfoView addToView:self.ownerView];
+  [MWMMapViewControlsManager manager].searchHidden = YES;
 }
 
 - (void)mwm_refreshUI
@@ -246,4 +247,10 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
   return self.navigationInfoView.extraCompassBottomOffset;
 }
 
+- (void)setMapSearch
+{
+  if (_navigationInfoView)
+    [self.navigationInfoView setMapSearch];
+}
+
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h
index 1eeda5ea64..032c48ec55 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h
@@ -1,12 +1,27 @@
 #import "MWMNavigationDashboardInfoProtocol.h"
 
+enum class NavigationSearchState
+{
+  Maximized,
+  MinimizedNormal,
+  MinimizedSearch,
+  MinimizedGas,
+  MinimizedParking,
+  MinimizedFood,
+  MinimizedShop,
+  MinimizedATM
+};
+
 @interface MWMNavigationInfoView : UIView<MWMNavigationDashboardInfoProtocol>
 
 @property(nonatomic) CGFloat leftBound;
 @property(nonatomic, readonly) CGFloat extraCompassBottomOffset;
 @property(nonatomic, readonly) CGFloat visibleHeight;
+@property(nonatomic, readonly) NavigationSearchState searchState;
 
 - (void)addToView:(UIView *)superview;
 - (void)remove;
 
+- (void)setMapSearch;
+
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
index 8b5f766242..afbb56e865 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
@@ -1,9 +1,12 @@
 #import "MWMNavigationInfoView.h"
+#import "AppInfo.h"
 #import "Common.h"
 #import "MWMButton.h"
 #import "MWMLocationHelpers.h"
 #import "MWMLocationManager.h"
+#import "MWMMapViewControlsManager.h"
 #import "MWMRouter.h"
+#import "MWMSearch.h"
 #import "UIFont+MapsMeFonts.h"
 #import "UIImageView+Coloring.h"
 
@@ -25,27 +28,22 @@ CGFloat constexpr kSearchButtonsSideSize = 44;
 
 NSTimeInterval constexpr kCollapseSearchTimeout = 5.0;
 
-enum class SearchState
-{
-  Maximized,
-  MinimizedNormal,
-  MinimizedSearch,
-  MinimizedGas,
-  MinimizedParking,
-  MinimizedFood,
-  MinimizedShop,
-  MinimizedATM
-};
+map<NavigationSearchState, NSString *> const kSearchStateButtonImageNames{
+    {NavigationSearchState::Maximized, @"ic_routing_search"},
+    {NavigationSearchState::MinimizedNormal, @"ic_routing_search"},
+    {NavigationSearchState::MinimizedSearch, @"ic_routing_search_off"},
+    {NavigationSearchState::MinimizedGas, @"ic_routing_fuel_off"},
+    {NavigationSearchState::MinimizedParking, @"ic_routing_parking_off"},
+    {NavigationSearchState::MinimizedFood, @"ic_routing_food_off"},
+    {NavigationSearchState::MinimizedShop, @"ic_routing_shop_off"},
+    {NavigationSearchState::MinimizedATM, @"ic_routing_atm_off"}};
 
-map<SearchState, NSString *> const kSearchStateButtonImageNames{
-    {SearchState::Maximized, @"ic_routing_search"},
-    {SearchState::MinimizedNormal, @"ic_routing_search"},
-    {SearchState::MinimizedSearch, @"ic_routing_search_off"},
-    {SearchState::MinimizedGas, @"ic_routing_fuel_off"},
-    {SearchState::MinimizedParking, @"ic_routing_parking_off"},
-    {SearchState::MinimizedFood, @"ic_routing_food_off"},
-    {SearchState::MinimizedShop, @"ic_routing_shop_off"},
-    {SearchState::MinimizedATM, @"ic_routing_atm_off"}};
+map<NavigationSearchState, NSString *> const kSearchButtonRequest{
+    {NavigationSearchState::MinimizedGas, L(@"fuel")},
+    {NavigationSearchState::MinimizedParking, L(@"parking")},
+    {NavigationSearchState::MinimizedFood, L(@"food")},
+    {NavigationSearchState::MinimizedShop, L(@"shop")},
+    {NavigationSearchState::MinimizedATM, L(@"atm")}};
 
 BOOL defaultOrientation()
 {
@@ -64,7 +62,6 @@ BOOL defaultOrientation()
 @property(weak, nonatomic) IBOutlet UIImageView * secondTurnImageView;
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint * turnsWidth;
 
-@property(weak, nonatomic) IBOutlet UIView * searchView;
 @property(weak, nonatomic) IBOutlet UIView * searchButtonsView;
 @property(weak, nonatomic) IBOutlet MWMButton * searchMainButton;
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsViewHeight;
@@ -73,13 +70,13 @@ BOOL defaultOrientation()
 @property(nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray * searchLandscapeConstraints;
 @property(nonatomic) IBOutletCollection(UIButton) NSArray * searchButtons;
 @property(nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray * searchButtonsSideSize;
-@property(weak, nonatomic) IBOutlet MWMButton * searchButtonGas;
-@property(weak, nonatomic) IBOutlet MWMButton * searchButtonParking;
-@property(weak, nonatomic) IBOutlet MWMButton * searchButtonFood;
-@property(weak, nonatomic) IBOutlet MWMButton * searchButtonShop;
-@property(weak, nonatomic) IBOutlet MWMButton * searchButtonATM;
+@property(weak, nonatomic) IBOutlet MWMButton * searchGasButton;
+@property(weak, nonatomic) IBOutlet MWMButton * searchParkingButton;
+@property(weak, nonatomic) IBOutlet MWMButton * searchFoodButton;
+@property(weak, nonatomic) IBOutlet MWMButton * searchShopButton;
+@property(weak, nonatomic) IBOutlet MWMButton * searchATMButton;
 
-@property(nonatomic) SearchState searchState;
+@property(nonatomic, readwrite) NavigationSearchState searchState;
 @property(nonatomic) BOOL isVisible;
 
 @property(weak, nonatomic) MWMNavigationDashboardEntity * navigationInfo;
@@ -91,7 +88,7 @@ BOOL defaultOrientation()
 - (void)addToView:(UIView *)superview
 {
   self.isVisible = YES;
-  [self setSearchState:SearchState::MinimizedNormal animated:NO];
+  [self setSearchState:NavigationSearchState::MinimizedNormal animated:NO];
   if (IPAD)
   {
     self.turnsWidth.constant = kTurnsiPadWidth;
@@ -123,44 +120,58 @@ BOOL defaultOrientation()
 }
 
 - (CGFloat)visibleHeight { return self.streetNameView.maxY; }
+- (void)setMapSearch { [self setSearchState:NavigationSearchState::MinimizedSearch animated:YES]; }
 #pragma mark - Search
 
 - (IBAction)searchMainButtonTouchUpInside
 {
   switch (self.searchState)
   {
-  case SearchState::Maximized:
-    [self setSearchState:SearchState::MinimizedSearch animated:YES];
+  case NavigationSearchState::Maximized:
+    [MWMMapViewControlsManager manager].searchHidden = NO;
+    [self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
     break;
-  case SearchState::MinimizedNormal:
-    [self setSearchState:SearchState::Maximized animated:YES];
+  case NavigationSearchState::MinimizedNormal:
+    [self setSearchState:NavigationSearchState::Maximized animated:YES];
     break;
-  case SearchState::MinimizedSearch:
-  case SearchState::MinimizedGas:
-  case SearchState::MinimizedParking:
-  case SearchState::MinimizedFood:
-  case SearchState::MinimizedShop:
-  case SearchState::MinimizedATM:
-    [self setSearchState:SearchState::MinimizedNormal animated:YES];
+  case NavigationSearchState::MinimizedSearch:
+  case NavigationSearchState::MinimizedGas:
+  case NavigationSearchState::MinimizedParking:
+  case NavigationSearchState::MinimizedFood:
+  case NavigationSearchState::MinimizedShop:
+  case NavigationSearchState::MinimizedATM:
+    [MWMSearch clear];
+    [self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
     break;
   }
 }
 
 - (IBAction)searchButtonTouchUpInside:(MWMButton *)sender
 {
-  if (sender == self.searchButtonGas)
-    [self setSearchState:SearchState::MinimizedGas animated:YES];
-  else if (sender == self.searchButtonParking)
-    [self setSearchState:SearchState::MinimizedParking animated:YES];
-  else if (sender == self.searchButtonFood)
-    [self setSearchState:SearchState::MinimizedFood animated:YES];
-  else if (sender == self.searchButtonShop)
-    [self setSearchState:SearchState::MinimizedShop animated:YES];
-  else if (sender == self.searchButtonATM)
-    [self setSearchState:SearchState::MinimizedATM animated:YES];
+  auto const body = ^(NavigationSearchState state) {
+    [MWMSearch setSearchOnMap:YES];
+    NSString * query = [kSearchButtonRequest.at(state) stringByAppendingString:@" "];
+    NSString * locale = [[AppInfo sharedInfo] languageId];
+    [MWMSearch searchQuery:query forInputLocale:locale];
+    [self setSearchState:state animated:YES];
+  };
+
+  if (sender == self.searchGasButton)
+    body(NavigationSearchState::MinimizedGas);
+  else if (sender == self.searchParkingButton)
+    body(NavigationSearchState::MinimizedParking);
+  else if (sender == self.searchFoodButton)
+    body(NavigationSearchState::MinimizedFood);
+  else if (sender == self.searchShopButton)
+    body(NavigationSearchState::MinimizedShop);
+  else if (sender == self.searchATMButton)
+    body(NavigationSearchState::MinimizedATM);
 }
 
-- (void)collapseSearchOnTimer { [self setSearchState:SearchState::MinimizedNormal animated:YES]; }
+- (void)collapseSearchOnTimer
+{
+  [self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
+}
 #pragma mark - MWMNavigationDashboardInfoProtocol
 
 - (void)updateNavigationInfo:(MWMNavigationDashboardEntity *)info
@@ -211,7 +222,7 @@ BOOL defaultOrientation()
       defaultView ? kSearchMainButtonBottomOffsetPortrait : kSearchMainButtonBottomOffsetLandscape;
   CGFloat alpha = 1;
   CGFloat searchButtonsSideSize = kSearchButtonsSideSize;
-  if (self.searchState == SearchState::Maximized)
+  if (self.searchState == NavigationSearchState::Maximized)
   {
     self.searchButtonsViewWidth.constant =
         defaultView ? kSearchButtonsViewWidthPortrait : kSearchButtonsViewWidthLandscape;
@@ -254,30 +265,30 @@ BOOL defaultOrientation()
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  if (self.searchState == SearchState::Maximized)
+  if (self.searchState == NavigationSearchState::Maximized)
     return;
   [super touchesBegan:touches withEvent:event];
 }
 
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  if (self.searchState == SearchState::Maximized)
+  if (self.searchState == NavigationSearchState::Maximized)
     return;
   [super touchesMoved:touches withEvent:event];
 }
 
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  if (self.searchState == SearchState::Maximized)
-    [self setSearchState:SearchState::MinimizedNormal animated:YES];
+  if (self.searchState == NavigationSearchState::Maximized)
+    [self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
   else
     [super touchesEnded:touches withEvent:event];
 }
 
 - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  if (self.searchState == SearchState::Maximized)
-    [self setSearchState:SearchState::MinimizedNormal animated:YES];
+  if (self.searchState == NavigationSearchState::Maximized)
+    [self setSearchState:NavigationSearchState::MinimizedNormal animated:YES];
   else
     [super touchesCancelled:touches withEvent:event];
 }
@@ -301,7 +312,7 @@ BOOL defaultOrientation()
                    }];
 }
 
-- (void)setSearchState:(SearchState)searchState animated:(BOOL)animated
+- (void)setSearchState:(NavigationSearchState)searchState animated:(BOOL)animated
 {
   self.searchState = searchState;
   auto block = ^{
@@ -319,7 +330,7 @@ BOOL defaultOrientation()
   }
   SEL const collapseSelector = @selector(collapseSearchOnTimer);
   [NSObject cancelPreviousPerformRequestsWithTarget:self selector:collapseSelector object:self];
-  if (self.searchState == SearchState::Maximized)
+  if (self.searchState == NavigationSearchState::Maximized)
   {
     [self.superview bringSubviewToFront:self];
     [self performSelector:collapseSelector withObject:self afterDelay:kCollapseSearchTimeout];
@@ -330,7 +341,7 @@ BOOL defaultOrientation()
   }
 }
 
-- (void)setSearchState:(SearchState)searchState
+- (void)setSearchState:(NavigationSearchState)searchState
 {
   _searchState = searchState;
   self.searchMainButton.imageName = kSearchStateButtonImageNames.at(searchState);
@@ -356,11 +367,12 @@ BOOL defaultOrientation()
 {
   _leftBound = MAX(leftBound, 0.0);
   [self setNeedsLayout];
+  [self layoutIfNeeded];
 }
 
 - (CGFloat)extraCompassBottomOffset
 {
-  return defaultOrientation() || self.searchView.hidden ? 0 : kSearchButtonsViewHeightLandscape;
+  return defaultOrientation() ? 0 : kSearchButtonsViewHeightLandscape;
 }
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.xib
index e199d3dfa3..1cfa33f3a1 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.xib
@@ -16,11 +16,14 @@
             <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YYv-pG-Wkw" userLabel="Street name">
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YYv-pG-Wkw" userLabel="Street name" customClass="SolidTouchView">
                     <rect key="frame" x="0.0" y="0.0" width="600" height="65"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ленинградский проспект" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ShI-bz-5g8">
                             <rect key="frame" x="112" y="32" width="480" height="21"/>
+                            <accessibility key="accessibilityConfiguration">
+                                <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
+                            </accessibility>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -30,6 +33,9 @@
                         </label>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" notEnabled="YES"/>
+                    </accessibility>
                     <constraints>
                         <constraint firstItem="ShI-bz-5g8" firstAttribute="top" secondItem="YYv-pG-Wkw" secondAttribute="top" constant="32" id="KK1-dA-hII"/>
                         <constraint firstAttribute="trailing" secondItem="ShI-bz-5g8" secondAttribute="trailing" priority="999" constant="8" id="ZPY-xp-9Ew"/>
@@ -39,7 +45,7 @@
                         <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aa6-N8-acP" userLabel="Turns">
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aa6-N8-acP" userLabel="Turns" customClass="SolidTouchView">
                     <rect key="frame" x="8" y="28" width="96" height="153"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wt8-EO-MKz" userLabel="First turn">
@@ -115,6 +121,9 @@
                         </view>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <accessibility key="accessibilityConfiguration">
+                        <accessibilityTraits key="traits" notEnabled="YES"/>
+                    </accessibility>
                     <constraints>
                         <constraint firstAttribute="width" constant="96" id="6Ja-Xp-g8h"/>
                         <constraint firstAttribute="trailing" secondItem="wt8-EO-MKz" secondAttribute="trailing" id="AQV-lK-vNF"/>
@@ -126,193 +135,180 @@
                         <constraint firstItem="wt8-EO-MKz" firstAttribute="top" secondItem="Aa6-N8-acP" secondAttribute="top" id="v5F-4v-Sfr"/>
                     </constraints>
                 </view>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ixv-dD-46I" userLabel="Search View">
-                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TMW-aw-1RT">
+                    <rect key="frame" x="-70" y="300" width="200" height="200"/>
                     <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TMW-aw-1RT">
-                            <rect key="frame" x="-70" y="296" width="200" height="200"/>
-                            <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Bv-7H-IZt" userLabel="Gas" customClass="MWMButton">
-                                    <rect key="frame" x="78" y="14" width="44" height="44"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" priority="750" constant="44" id="KKe-fH-h2n"/>
-                                        <constraint firstAttribute="height" priority="750" constant="44" id="UEW-5h-9Jk"/>
-                                    </constraints>
-                                    <state key="normal" image="ic_routing_fuel_on"/>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
-                                    </userDefinedRuntimeAttributes>
-                                    <connections>
-                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="sxM-U8-yee"/>
-                                    </connections>
-                                </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RP3-01-Pj7" userLabel="Parking" customClass="MWMButton">
-                                    <rect key="frame" x="122" y="34" width="44" height="44"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" priority="750" constant="44" id="iq3-j8-GZG"/>
-                                        <constraint firstAttribute="width" priority="750" constant="44" id="lwq-aN-y8y"/>
-                                    </constraints>
-                                    <state key="normal" image="ic_routing_parking_on"/>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
-                                    </userDefinedRuntimeAttributes>
-                                    <connections>
-                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="uiN-0q-kol"/>
-                                    </connections>
-                                </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GcK-FI-VXw" userLabel="Food" customClass="MWMButton">
-                                    <rect key="frame" x="142" y="78" width="44" height="44"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" priority="750" constant="44" id="euI-Cb-zo4"/>
-                                        <constraint firstAttribute="height" priority="750" constant="44" id="kdi-mH-aab"/>
-                                    </constraints>
-                                    <state key="normal" image="ic_routing_food_on"/>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
-                                    </userDefinedRuntimeAttributes>
-                                    <connections>
-                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="3le-Cd-rvC"/>
-                                    </connections>
-                                </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ggf-tc-U3R" userLabel="Shop" customClass="MWMButton">
-                                    <rect key="frame" x="122" y="122" width="44" height="44"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" priority="750" constant="44" id="2g5-C3-nTL"/>
-                                        <constraint firstAttribute="height" priority="750" constant="44" id="fKJ-SP-gfS"/>
-                                    </constraints>
-                                    <state key="normal" image="ic_routing_shop_on"/>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
-                                    </userDefinedRuntimeAttributes>
-                                    <connections>
-                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="hkk-Xo-uPg"/>
-                                    </connections>
-                                </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uoS-b2-FcN" userLabel="ATM" customClass="MWMButton">
-                                    <rect key="frame" x="78" y="142" width="44" height="44"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" priority="750" constant="44" id="Kvn-g8-63x"/>
-                                        <constraint firstAttribute="height" priority="750" constant="44" id="rwg-ce-ESb"/>
-                                    </constraints>
-                                    <state key="normal" image="ic_routing_atm_on"/>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
-                                    </userDefinedRuntimeAttributes>
-                                    <connections>
-                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Pqo-CT-Cog"/>
-                                    </connections>
-                                </button>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Bv-7H-IZt" userLabel="Gas" customClass="MWMButton">
+                            <rect key="frame" x="78" y="14" width="44" height="44"/>
                             <constraints>
-                                <constraint firstItem="GcK-FI-VXw" firstAttribute="trailing" secondItem="Ggf-tc-U3R" secondAttribute="leading" priority="250" id="89h-kJ-0pV"/>
-                                <constraint firstItem="RP3-01-Pj7" firstAttribute="leading" secondItem="2Bv-7H-IZt" secondAttribute="trailing" priority="250" id="C9o-Bx-KXq"/>
-                                <constraint firstAttribute="height" constant="200" id="ClV-rj-I5W"/>
-                                <constraint firstAttribute="trailing" secondItem="Ggf-tc-U3R" secondAttribute="trailing" priority="500" constant="34" id="Cxa-Ms-3ud"/>
-                                <constraint firstItem="uoS-b2-FcN" firstAttribute="centerX" secondItem="TMW-aw-1RT" secondAttribute="centerX" priority="500" id="Fva-Vq-x1E"/>
-                                <constraint firstItem="GcK-FI-VXw" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" id="HaH-4G-jWc"/>
-                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="NcX-Rf-Cvm"/>
-                                <constraint firstAttribute="bottom" secondItem="uoS-b2-FcN" secondAttribute="bottom" priority="500" constant="14" id="Skj-gh-LVA"/>
-                                <constraint firstAttribute="bottom" secondItem="Ggf-tc-U3R" secondAttribute="bottom" priority="500" constant="34" id="ZWZ-hv-s2X"/>
-                                <constraint firstAttribute="trailing" secondItem="RP3-01-Pj7" secondAttribute="trailing" priority="500" constant="34" id="ZrU-lQ-I2d"/>
-                                <constraint firstItem="RP3-01-Pj7" firstAttribute="top" secondItem="TMW-aw-1RT" secondAttribute="top" priority="500" constant="34" id="eMY-fr-9hS"/>
-                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="top" secondItem="TMW-aw-1RT" secondAttribute="top" priority="500" constant="14" id="eOX-wt-nUe"/>
-                                <constraint firstItem="RP3-01-Pj7" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="iSp-hy-tmq"/>
-                                <constraint firstItem="uoS-b2-FcN" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="j4g-jo-knc"/>
-                                <constraint firstAttribute="trailing" secondItem="GcK-FI-VXw" secondAttribute="trailing" priority="500" constant="14" id="jlf-5n-9UR"/>
-                                <constraint firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="trailing" priority="250" constant="8" id="lOI-E1-KoS"/>
-                                <constraint firstAttribute="width" constant="200" id="mOu-Vw-eLb"/>
-                                <constraint firstItem="GcK-FI-VXw" firstAttribute="leading" secondItem="RP3-01-Pj7" secondAttribute="trailing" priority="250" id="nxu-rz-dZp"/>
-                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="centerX" secondItem="TMW-aw-1RT" secondAttribute="centerX" priority="500" id="s89-b9-XaO"/>
-                                <constraint firstItem="Ggf-tc-U3R" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="sVL-ni-mon"/>
-                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="TMW-aw-1RT" secondAttribute="leading" id="vbk-wb-RCv"/>
-                                <constraint firstItem="Ggf-tc-U3R" firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="leading" priority="250" id="vcn-Dj-WUu"/>
+                                <constraint firstAttribute="width" priority="750" constant="44" id="KKe-fH-h2n"/>
+                                <constraint firstAttribute="height" priority="750" constant="44" id="UEW-5h-9Jk"/>
                             </constraints>
+                            <state key="normal" image="ic_routing_fuel_on"/>
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
                             </userDefinedRuntimeAttributes>
-                        </view>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xna-Q1-7zW" customClass="MWMButton">
-                            <rect key="frame" x="4" y="370" width="52" height="52"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="52" id="IJq-4U-XHW"/>
-                                <constraint firstAttribute="height" constant="52" id="cvr-aL-Qfk"/>
-                            </constraints>
-                            <state key="normal" image="ic_routing_search_light"/>
                             <connections>
-                                <action selector="searchMainButtonTouchUpInside" destination="iN0-l3-epB" eventType="touchUpInside" id="gd5-zu-3i5"/>
+                                <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="sxM-U8-yee"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RP3-01-Pj7" userLabel="Parking" customClass="MWMButton">
+                            <rect key="frame" x="122" y="34" width="44" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="height" priority="750" constant="44" id="iq3-j8-GZG"/>
+                                <constraint firstAttribute="width" priority="750" constant="44" id="lwq-aN-y8y"/>
+                            </constraints>
+                            <state key="normal" image="ic_routing_parking_on"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="uiN-0q-kol"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GcK-FI-VXw" userLabel="Food" customClass="MWMButton">
+                            <rect key="frame" x="142" y="78" width="44" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="width" priority="750" constant="44" id="euI-Cb-zo4"/>
+                                <constraint firstAttribute="height" priority="750" constant="44" id="kdi-mH-aab"/>
+                            </constraints>
+                            <state key="normal" image="ic_routing_food_on"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="3le-Cd-rvC"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ggf-tc-U3R" userLabel="Shop" customClass="MWMButton">
+                            <rect key="frame" x="122" y="122" width="44" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="width" priority="750" constant="44" id="2g5-C3-nTL"/>
+                                <constraint firstAttribute="height" priority="750" constant="44" id="fKJ-SP-gfS"/>
+                            </constraints>
+                            <state key="normal" image="ic_routing_shop_on"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="hkk-Xo-uPg"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uoS-b2-FcN" userLabel="ATM" customClass="MWMButton">
+                            <rect key="frame" x="78" y="142" width="44" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="width" priority="750" constant="44" id="Kvn-g8-63x"/>
+                                <constraint firstAttribute="height" priority="750" constant="44" id="rwg-ce-ESb"/>
+                            </constraints>
+                            <state key="normal" image="ic_routing_atm_on"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Pqo-CT-Cog"/>
                             </connections>
                         </button>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstItem="TMW-aw-1RT" firstAttribute="centerX" secondItem="Xna-Q1-7zW" secondAttribute="centerX" priority="500" id="1Pl-9Y-jWd"/>
-                        <constraint firstItem="TMW-aw-1RT" firstAttribute="centerY" secondItem="Xna-Q1-7zW" secondAttribute="centerY" id="AGD-5W-5H7"/>
-                        <constraint firstItem="TMW-aw-1RT" firstAttribute="leading" secondItem="Xna-Q1-7zW" secondAttribute="leading" priority="250" constant="-2" id="E5M-tf-wE0"/>
-                        <constraint firstItem="Xna-Q1-7zW" firstAttribute="leading" secondItem="ixv-dD-46I" secondAttribute="leading" constant="4" id="i9Y-yZ-H5L"/>
-                        <constraint firstAttribute="bottom" secondItem="Xna-Q1-7zW" secondAttribute="bottom" constant="178" id="tqX-aT-1fV"/>
+                        <constraint firstItem="GcK-FI-VXw" firstAttribute="trailing" secondItem="Ggf-tc-U3R" secondAttribute="leading" priority="250" id="89h-kJ-0pV"/>
+                        <constraint firstItem="RP3-01-Pj7" firstAttribute="leading" secondItem="2Bv-7H-IZt" secondAttribute="trailing" priority="250" id="C9o-Bx-KXq"/>
+                        <constraint firstAttribute="height" constant="200" id="ClV-rj-I5W"/>
+                        <constraint firstAttribute="trailing" secondItem="Ggf-tc-U3R" secondAttribute="trailing" priority="500" constant="34" id="Cxa-Ms-3ud"/>
+                        <constraint firstItem="uoS-b2-FcN" firstAttribute="centerX" secondItem="TMW-aw-1RT" secondAttribute="centerX" priority="500" id="Fva-Vq-x1E"/>
+                        <constraint firstItem="GcK-FI-VXw" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" id="HaH-4G-jWc"/>
+                        <constraint firstItem="2Bv-7H-IZt" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="NcX-Rf-Cvm"/>
+                        <constraint firstAttribute="bottom" secondItem="uoS-b2-FcN" secondAttribute="bottom" priority="500" constant="14" id="Skj-gh-LVA"/>
+                        <constraint firstAttribute="bottom" secondItem="Ggf-tc-U3R" secondAttribute="bottom" priority="500" constant="34" id="ZWZ-hv-s2X"/>
+                        <constraint firstAttribute="trailing" secondItem="RP3-01-Pj7" secondAttribute="trailing" priority="500" constant="34" id="ZrU-lQ-I2d"/>
+                        <constraint firstItem="RP3-01-Pj7" firstAttribute="top" secondItem="TMW-aw-1RT" secondAttribute="top" priority="500" constant="34" id="eMY-fr-9hS"/>
+                        <constraint firstItem="2Bv-7H-IZt" firstAttribute="top" secondItem="TMW-aw-1RT" secondAttribute="top" priority="500" constant="14" id="eOX-wt-nUe"/>
+                        <constraint firstItem="RP3-01-Pj7" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="iSp-hy-tmq"/>
+                        <constraint firstItem="uoS-b2-FcN" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="j4g-jo-knc"/>
+                        <constraint firstAttribute="trailing" secondItem="GcK-FI-VXw" secondAttribute="trailing" priority="500" constant="14" id="jlf-5n-9UR"/>
+                        <constraint firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="trailing" priority="250" constant="8" id="lOI-E1-KoS"/>
+                        <constraint firstAttribute="width" constant="200" id="mOu-Vw-eLb"/>
+                        <constraint firstItem="GcK-FI-VXw" firstAttribute="leading" secondItem="RP3-01-Pj7" secondAttribute="trailing" priority="250" id="nxu-rz-dZp"/>
+                        <constraint firstItem="2Bv-7H-IZt" firstAttribute="centerX" secondItem="TMW-aw-1RT" secondAttribute="centerX" priority="500" id="s89-b9-XaO"/>
+                        <constraint firstItem="Ggf-tc-U3R" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="sVL-ni-mon"/>
+                        <constraint firstItem="2Bv-7H-IZt" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="TMW-aw-1RT" secondAttribute="leading" id="vbk-wb-RCv"/>
+                        <constraint firstItem="Ggf-tc-U3R" firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="leading" priority="250" id="vcn-Dj-WUu"/>
                     </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/>
+                    </userDefinedRuntimeAttributes>
                 </view>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xna-Q1-7zW" customClass="MWMButton">
+                    <rect key="frame" x="4" y="374" width="52" height="52"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="52" id="IJq-4U-XHW"/>
+                        <constraint firstAttribute="height" constant="52" id="cvr-aL-Qfk"/>
+                    </constraints>
+                    <state key="normal" image="ic_routing_search_light"/>
+                    <connections>
+                        <action selector="searchMainButtonTouchUpInside" destination="iN0-l3-epB" eventType="touchUpInside" id="gd5-zu-3i5"/>
+                    </connections>
+                </button>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="YYv-pG-Wkw" secondAttribute="trailing" id="15D-kN-gda"/>
+                <constraint firstItem="TMW-aw-1RT" firstAttribute="centerX" secondItem="Xna-Q1-7zW" secondAttribute="centerX" priority="500" id="BCi-8L-WDe"/>
                 <constraint firstItem="YYv-pG-Wkw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="IBQ-gK-Cpe"/>
-                <constraint firstItem="ixv-dD-46I" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Qbd-eO-MzU"/>
                 <constraint firstItem="YYv-pG-Wkw" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Rd5-Hl-fSF"/>
-                <constraint firstAttribute="bottom" secondItem="ixv-dD-46I" secondAttribute="bottom" id="af4-kO-uKn"/>
+                <constraint firstItem="TMW-aw-1RT" firstAttribute="leading" secondItem="Xna-Q1-7zW" secondAttribute="leading" priority="250" constant="-2" id="Sxn-9S-2ol"/>
+                <constraint firstItem="TMW-aw-1RT" firstAttribute="centerY" secondItem="Xna-Q1-7zW" secondAttribute="centerY" id="WKU-a9-BaM"/>
                 <constraint firstItem="Aa6-N8-acP" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="28" id="goU-O7-rpS"/>
                 <constraint firstItem="ShI-bz-5g8" firstAttribute="leading" secondItem="Aa6-N8-acP" secondAttribute="trailing" priority="999" constant="8" id="mdA-B9-tvQ"/>
                 <constraint firstItem="Aa6-N8-acP" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="pXD-dk-ku2"/>
-                <constraint firstAttribute="trailing" secondItem="ixv-dD-46I" secondAttribute="trailing" id="yjN-n2-p8N"/>
-                <constraint firstItem="ixv-dD-46I" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="z9B-Oj-yrv"/>
+                <constraint firstItem="Xna-Q1-7zW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="4" id="peg-y6-vsC"/>
+                <constraint firstAttribute="bottom" secondItem="Xna-Q1-7zW" secondAttribute="bottom" constant="174" id="sFJ-1E-hky"/>
             </constraints>
             <connections>
                 <outlet property="distanceToNextTurnLabel" destination="KuR-1J-VI2" id="n0i-t9-Vj2"/>
                 <outlet property="nextTurnImageView" destination="AJe-8N-rpk" id="iMm-9u-rPI"/>
-                <outlet property="searchButtonATM" destination="uoS-b2-FcN" id="OBU-wK-liD"/>
-                <outlet property="searchButtonFood" destination="GcK-FI-VXw" id="c0L-PA-HFw"/>
-                <outlet property="searchButtonGas" destination="2Bv-7H-IZt" id="uch-Sv-2IQ"/>
-                <outlet property="searchButtonParking" destination="RP3-01-Pj7" id="YXz-Jq-WA9"/>
-                <outlet property="searchButtonShop" destination="Ggf-tc-U3R" id="kug-72-6VO"/>
+                <outlet property="searchATMButton" destination="uoS-b2-FcN" id="Sp2-hc-Lob"/>
                 <outlet property="searchButtonsView" destination="TMW-aw-1RT" id="bQd-e2-Jey"/>
                 <outlet property="searchButtonsViewHeight" destination="ClV-rj-I5W" id="egz-NO-EAn"/>
                 <outlet property="searchButtonsViewWidth" destination="mOu-Vw-eLb" id="SsK-HE-lHC"/>
+                <outlet property="searchFoodButton" destination="GcK-FI-VXw" id="G0h-uf-9uS"/>
+                <outlet property="searchGasButton" destination="2Bv-7H-IZt" id="hUg-CH-kWQ"/>
                 <outlet property="searchMainButton" destination="Xna-Q1-7zW" id="v48-fa-MQE"/>
-                <outlet property="searchMainButtonBottomOffset" destination="tqX-aT-1fV" id="hfV-xg-ghC"/>
-                <outlet property="searchView" destination="ixv-dD-46I" id="HD8-7c-fRB"/>
+                <outlet property="searchMainButtonBottomOffset" destination="sFJ-1E-hky" id="ysB-DO-NgU"/>
+                <outlet property="searchParkingButton" destination="RP3-01-Pj7" id="sdL-mN-sLE"/>
+                <outlet property="searchShopButton" destination="Ggf-tc-U3R" id="RJJ-mh-rwy"/>
                 <outlet property="secondTurnImageView" destination="CKi-sy-dNO" id="A29-2z-4oh"/>
                 <outlet property="secondTurnView" destination="8Zu-Ff-6p2" id="yEK-rY-S50"/>
                 <outlet property="streetNameLabel" destination="ShI-bz-5g8" id="eZd-Es-g0l"/>
                 <outlet property="streetNameView" destination="YYv-pG-Wkw" id="gbk-SH-idq"/>
                 <outlet property="turnsView" destination="Aa6-N8-acP" id="daB-uQ-UFM"/>
                 <outlet property="turnsWidth" destination="6Ja-Xp-g8h" id="kCr-a1-fph"/>
-                <outletCollection property="searchLandscapeConstraints" destination="E5M-tf-wE0" id="y6q-K4-nzY"/>
-                <outletCollection property="searchLandscapeConstraints" destination="NcX-Rf-Cvm" id="vwd-uF-iTf"/>
                 <outletCollection property="searchLandscapeConstraints" destination="iSp-hy-tmq" id="h2M-dj-EiD"/>
                 <outletCollection property="searchLandscapeConstraints" destination="C9o-Bx-KXq" id="5a5-4m-Dyf"/>
-                <outletCollection property="searchLandscapeConstraints" destination="nxu-rz-dZp" id="Y1O-08-buw"/>
+                <outletCollection property="searchButtonsSideSize" destination="Kvn-g8-63x" id="EBu-lt-pbc"/>
+                <outletCollection property="searchButtonsSideSize" destination="KKe-fH-h2n" id="Okh-Is-iMi"/>
+                <outletCollection property="searchButtons" destination="uoS-b2-FcN" id="1Ly-Ve-2RT"/>
+                <outletCollection property="searchButtonsSideSize" destination="rwg-ce-ESb" id="jHF-yA-fAg"/>
+                <outletCollection property="searchButtonsSideSize" destination="lwq-aN-y8y" id="hmh-cr-pZk"/>
+                <outletCollection property="searchButtonsSideSize" destination="kdi-mH-aab" id="Kof-TU-UYG"/>
+                <outletCollection property="searchButtons" destination="2Bv-7H-IZt" id="co8-GL-K6m"/>
+                <outletCollection property="searchLandscapeConstraints" destination="lOI-E1-KoS" id="Zeu-Nj-vBU"/>
                 <outletCollection property="searchLandscapeConstraints" destination="89h-kJ-0pV" id="xBD-bu-bfe"/>
                 <outletCollection property="searchLandscapeConstraints" destination="sVL-ni-mon" id="DTz-eP-FWo"/>
-                <outletCollection property="searchLandscapeConstraints" destination="j4g-jo-knc" id="EG6-ya-ahs"/>
-                <outletCollection property="searchLandscapeConstraints" destination="vcn-Dj-WUu" id="kjW-Jd-TLm"/>
-                <outletCollection property="searchLandscapeConstraints" destination="lOI-E1-KoS" id="Zeu-Nj-vBU"/>
-                <outletCollection property="searchButtons" destination="2Bv-7H-IZt" id="co8-GL-K6m"/>
-                <outletCollection property="searchButtons" destination="RP3-01-Pj7" id="1nL-Ib-y49"/>
-                <outletCollection property="searchButtons" destination="GcK-FI-VXw" id="Ykw-0h-Emh"/>
                 <outletCollection property="searchButtons" destination="Ggf-tc-U3R" id="FIp-4y-5eA"/>
-                <outletCollection property="searchButtons" destination="uoS-b2-FcN" id="1Ly-Ve-2RT"/>
-                <outletCollection property="searchButtonsSideSize" destination="KKe-fH-h2n" id="Okh-Is-iMi"/>
-                <outletCollection property="searchButtonsSideSize" destination="UEW-5h-9Jk" id="ZWN-om-GgR"/>
-                <outletCollection property="searchButtonsSideSize" destination="iq3-j8-GZG" id="WjZ-71-4er"/>
-                <outletCollection property="searchButtonsSideSize" destination="lwq-aN-y8y" id="hmh-cr-pZk"/>
-                <outletCollection property="searchButtonsSideSize" destination="euI-Cb-zo4" id="W8L-Ax-Ks1"/>
-                <outletCollection property="searchButtonsSideSize" destination="kdi-mH-aab" id="Kof-TU-UYG"/>
-                <outletCollection property="searchButtonsSideSize" destination="2g5-C3-nTL" id="hKe-PI-ohQ"/>
+                <outletCollection property="searchButtons" destination="GcK-FI-VXw" id="Ykw-0h-Emh"/>
                 <outletCollection property="searchButtonsSideSize" destination="fKJ-SP-gfS" id="hmq-Zw-cVL"/>
-                <outletCollection property="searchButtonsSideSize" destination="Kvn-g8-63x" id="EBu-lt-pbc"/>
-                <outletCollection property="searchButtonsSideSize" destination="rwg-ce-ESb" id="jHF-yA-fAg"/>
+                <outletCollection property="searchButtonsSideSize" destination="iq3-j8-GZG" id="WjZ-71-4er"/>
+                <outletCollection property="searchLandscapeConstraints" destination="nxu-rz-dZp" id="Y1O-08-buw"/>
+                <outletCollection property="searchLandscapeConstraints" destination="vcn-Dj-WUu" id="kjW-Jd-TLm"/>
+                <outletCollection property="searchLandscapeConstraints" destination="j4g-jo-knc" id="EG6-ya-ahs"/>
+                <outletCollection property="searchButtonsSideSize" destination="2g5-C3-nTL" id="hKe-PI-ohQ"/>
+                <outletCollection property="searchLandscapeConstraints" destination="NcX-Rf-Cvm" id="vwd-uF-iTf"/>
+                <outletCollection property="searchButtonsSideSize" destination="euI-Cb-zo4" id="W8L-Ax-Ks1"/>
+                <outletCollection property="searchButtons" destination="RP3-01-Pj7" id="1nL-Ib-y49"/>
+                <outletCollection property="searchButtonsSideSize" destination="UEW-5h-9Jk" id="ZWN-om-GgR"/>
+                <outletCollection property="searchLandscapeConstraints" destination="Sxn-9S-2ol" id="g6V-Kv-afo"/>
             </connections>
         </view>
     </objects>
diff --git a/iphone/Maps/Classes/Search/MWMSearch.mm b/iphone/Maps/Classes/Search/MWMSearch.mm
index 011ff5e1c5..c6218e1d52 100644
--- a/iphone/Maps/Classes/Search/MWMSearch.mm
+++ b/iphone/Maps/Classes/Search/MWMSearch.mm
@@ -21,6 +21,8 @@ using TObservers = NSHashTable<__kindof TObserver>;
 @property(nonatomic) BOOL searchOnMap;
 
 @property(nonatomic) BOOL textChanged;
+@property(nonatomic) BOOL isSearching;
+@property(nonatomic) BOOL isPendingUpdate;
 
 @property(nonatomic) TObservers * observers;
 
@@ -64,23 +66,48 @@ using TObservers = NSHashTable<__kindof TObserver>;
       if (!self)
         return;
       runAsyncOnMainQueue([self, results] {
-        if (!results.IsEndMarker())
+        if (results.IsEndMarker())
+        {
+          [self onSearchCompleted];
+        }
+        else
         {
           self->m_results = results;
           self.suggestionsCount = results.GetSuggestsCount();
           self.resultsCount = results.GetCount();
           [self onSearchResultsUpdated];
         }
-        else if (results.IsEndedNormal())
-        {
-          [self onSearchCompleted];
-        }
       });
     };
   }
   return self;
 }
 
+- (void)update
+{
+  if (self.isSearching)
+  {
+    self.isPendingUpdate = YES;
+    return;
+  }
+  self.isPendingUpdate = NO;
+  if (m_params.m_query.empty())
+    return;
+  CLLocation * lastLocation = [MWMLocationManager lastLocation];
+  if (lastLocation)
+    m_params.SetPosition(lastLocation.coordinate.latitude, lastLocation.coordinate.longitude);
+  if (self.searchOnMap)
+    GetFramework().StartInteractiveSearch(m_params);
+  else
+    GetFramework().Search(m_params);
+}
+
+- (void)showResultsOnMap
+{
+  if (self.searchOnMap)
+    GetFramework().ShowSearchResults(m_results);
+}
+
 #pragma mark - Add/Remove Observers
 
 + (void)addObserver:(id<MWMSearchObserver>)observer
@@ -132,6 +159,7 @@ using TObservers = NSHashTable<__kindof TObserver>;
 
 + (void)clear
 {
+  GetFramework().CancelInteractiveSearch();
   MWMSearch * manager = [MWMSearch manager];
   manager->m_params.Clear();
   manager->m_results.Clear();
@@ -149,34 +177,12 @@ using TObservers = NSHashTable<__kindof TObserver>;
 
 + (NSUInteger)suggestionsCount { return [MWMSearch manager].suggestionsCount; }
 + (NSUInteger)resultsCount { return [MWMSearch manager].resultsCount; }
-- (void)update
-{
-  auto & f = GetFramework();
-  f.CancelInteractiveSearch();
-  [self onSearchCompleted];
-  if (m_params.m_query.empty())
-    return;
-  CLLocation * lastLocation = [MWMLocationManager lastLocation];
-  if (lastLocation)
-    m_params.SetPosition(lastLocation.coordinate.latitude, lastLocation.coordinate.longitude);
-  if (self.searchOnMap)
-  {
-    if (self.textChanged)
-      f.UpdateUserViewportChanged();
-    else
-      f.ShowSearchResults(m_results);
-    f.StartInteractiveSearch(m_params);
-  }
-  else
-  {
-    f.Search(m_params);
-  }
-}
 
 #pragma mark - Notifications
 
 - (void)onSearchStarted
 {
+  self.isSearching = YES;
   for (TObserver observer in self.observers)
   {
     if ([observer respondsToSelector:@selector(onSearchStarted)])
@@ -186,13 +192,15 @@ using TObservers = NSHashTable<__kindof TObserver>;
 
 - (void)onSearchCompleted
 {
+  self.isSearching = NO;
+  if (self.isPendingUpdate)
+    [self update];
   for (TObserver observer in self.observers)
   {
     if ([observer respondsToSelector:@selector(onSearchCompleted)])
       [observer onSearchCompleted];
   }
-  if (IPAD)
-    GetFramework().UpdateUserViewportChanged();
+  [self showResultsOnMap];
 }
 
 - (void)onSearchResultsUpdated