diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsCollectionViewLayout.swift b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsCollectionViewLayout.swift
index b545dbede3..786805f026 100644
--- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsCollectionViewLayout.swift
+++ b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsCollectionViewLayout.swift
@@ -20,6 +20,7 @@ final class TagsCollectionViewLayout: UICollectionViewLayout {
   @IBInspectable var itemWidth: CGFloat = 50
   @IBInspectable var lineSpacing: CGFloat = 10
   @IBInspectable var elementsSpacing: CGFloat = 10
+  @IBInspectable var showHeaders: Bool = true
 
   override func prepare() {
     super.prepare()
@@ -39,7 +40,7 @@ final class TagsCollectionViewLayout: UICollectionViewLayout {
       
       let indexPath = IndexPath(item: 0, section: section)
       
-      if collectionView.numberOfSections > 0 {
+      if showHeaders {
         let headerSize = headersCache[indexPath]?.size ?? CGSize(width: contentWidth, height: itemHeight)
         let frame = CGRect(x: 0, y: yOffset, width: headerSize.width, height: headerSize.height)
         let attr = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, with: indexPath)
diff --git a/iphone/Maps/UI/Storyboard/SearchFilters.storyboard b/iphone/Maps/UI/Storyboard/SearchFilters.storyboard
index 2af1c6336c..1352d0af8a 100644
--- a/iphone/Maps/UI/Storyboard/SearchFilters.storyboard
+++ b/iphone/Maps/UI/Storyboard/SearchFilters.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -275,6 +275,7 @@
                                                             <userDefinedRuntimeAttribute type="number" keyPath="elementsSpacing">
                                                                 <real key="value" value="8"/>
                                                             </userDefinedRuntimeAttribute>
+                                                            <userDefinedRuntimeAttribute type="boolean" keyPath="showHeaders" value="NO"/>
                                                         </userDefinedRuntimeAttributes>
                                                     </collectionViewFlowLayout>
                                                     <cells>