     }
     
     func removeSearchBarFromNavigationBar(animated: Bool) {
+        titleViewSearchBar.isHidden = true
+        segmentedControl.isHidden = true
         searchBar = listAndSearchOverlaySearchBar
         navigationController?.setNavigationBarHidden(true, animated: animated)
         

    private var overlaySliderPanGestureRecognizer: UIPanGestureRecognizer?
    
    func addSearchBarToNavigationBar(animated: Bool) {
        searchBar = titleViewSearchBar
        navigationController?.setNavigationBarHidden(false, animated: animated)
        

        mapView.showsUserLocation = true
        
        tracker?.wmf_logView(self)
        
        if traitBasedViewMode == .listOverlay || traitBasedViewMode == .searchOverlay {
            navigationController?.setNavigationBarHidden(true, animated: animated)
        }
    }
    
    override func viewWillDisappear(_ animated: Bool) {
