diff --git a/iphone/Maps/UI/PlacePage/Components/TaxiViewController.swift b/iphone/Maps/UI/PlacePage/Components/TaxiViewController.swift
index 9bb86fab7a..5142a21c0e 100644
--- a/iphone/Maps/UI/PlacePage/Components/TaxiViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/TaxiViewController.swift
@@ -1,6 +1,6 @@
 protocol TaxiViewControllerDelegate: AnyObject {
   func didPressOrder()
-  func didTaxiShown()
+  func didShowTaxi()
 }
 
 class TaxiViewController: UIViewController {
@@ -41,7 +41,7 @@ class TaxiViewController: UIViewController {
       fatalError()
     }
     
-    delegate?.didTaxiShown()
+    delegate?.didShowTaxi()
   }
 
   @IBAction func onOrder(_ sender: UIButton) {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
index 96c9f9724d..f7878ed7b9 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
@@ -73,7 +73,7 @@ extension PlacePageInteractor: TaxiViewControllerDelegate {
     MWMPlacePageManagerHelper.orderTaxi(placePageData)
   }
   
-  func didTaxiShown() {
+  func didShowTaxi() {
     MWMPlacePageManagerHelper.taxiShown(placePageData)
   }
 }
diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
index dc1fcc0f4e..54544ed511 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
@@ -153,7 +153,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type)
   [self closePlacePage];
 }
 
-- (void)taxiShown:(PlacePageData *)data
+- (void)logTaxiShown:(PlacePageData *)data
 {
   NSString * providerString = [MWMPlacePageManager taxiProviderStatisticsString:data.taxiProvider];
   [Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{kStatProvider : providerString}];
diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
index 2c0df4eda5..94d7e3ca98 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
@@ -17,7 +17,7 @@
 - (void)addBusiness;
 - (void)addPlace:(CLLocationCoordinate2D)coordinate;
 - (void)orderTaxi:(PlacePageData *)data;
-- (void)taxiShown:(PlacePageData *)data;
+- (void)logTaxiShown:(PlacePageData *)data;
 - (void)openLocalAdsURL:(PlacePageData *)data;
 - (void)openWebsite:(PlacePageData *)data;
 - (void)call:(PlacePageData *)data;
@@ -80,7 +80,7 @@
 }
 
 + (void)taxiShown:(PlacePageData *)data {
-  [[MWMMapViewControlsManager manager].placePageManager taxiShown:data];
+  [[MWMMapViewControlsManager manager].placePageManager logTaxiShown:data];
 }
 
 + (void)openLocalAdsURL:(PlacePageData *)data {
diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift
index aeba2e0314..baa11fe98c 100644
--- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift
+++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift
@@ -5,8 +5,8 @@ protocol SearchBannerCellDelegate: AnyObject {
 
 class SearchBannerCell: MWMTableViewCell {
   @IBOutlet var iconView: UIImageView!
-  @IBOutlet weak var labelView: UILabel!
-  @IBOutlet weak var buttonView: UIButton!
+  @IBOutlet var labelView: UILabel!
+  @IBOutlet var buttonView: UIButton!
   
   private weak var delegate: SearchBannerCellDelegate?
   
diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
index be1d998998..152af00341 100644
--- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
@@ -65,16 +65,17 @@ final class SearchCategoriesViewController: MWMTableViewController {
     }
   }
   
-  private func bannerStatProvider() -> String {
-    switch banner!.mwmType {
+  private func bannerStatProvider(_ bannerType: MWMBannerType) -> String {
+    switch bannerType {
       case .citymobil: return kStatCitymobil
       default: return ""
     }
   }
   
   private func createBanner(_ indexPath: IndexPath) -> UITableViewCell {
+    guard let banner = banner else { fatalError("Banner must exist") }
     let cell = tableView.dequeueReusableCell(cell: SearchBannerCell.self, indexPath: indexPath)
-    switch self.banner!.mwmType {
+    switch banner.mwmType {
       case .citymobil:
         cell.configure(icon: "ic_taxi_logo_citymobil",
                        label: L("taxi"),
@@ -84,17 +85,20 @@ final class SearchCategoriesViewController: MWMTableViewController {
     }
     if (!bannerShown) {
       bannerShown = true;
-      Statistics.logEvent(kStatSearchSponsoredShow, withParameters: [kStatProvider: bannerStatProvider()]);
+      let provider = bannerStatProvider(banner.mwmType)
+      Statistics.logEvent(kStatSearchSponsoredShow, withParameters: [kStatProvider: provider]);
     }
     return cell
 
   }
   
   private func openBanner() {
-    if let url = URL(string: banner!.bannerID) {
+    guard let banner = banner else { fatalError("Banner must exist") }
+    if let url = URL(string: banner.bannerID) {
       UIApplication.shared.open(url)
     }
-    Statistics.logEvent(kStatSearchSponsoredSelect, withParameters: [kStatProvider: bannerStatProvider()]);
+    let provider = bannerStatProvider(banner.mwmType)
+    Statistics.logEvent(kStatSearchSponsoredSelect, withParameters: [kStatProvider: provider]);
   }
 }