fixed search query

Client/Frontend/Browser/BrowserViewController.swift

@@ -915,16 +915,17 @@ class BrowserViewController: UIViewController {
         
         searchController!.didMove(toParentViewController: self)
         */
-        if (searchController != nil && SettingsPrefs.shared.getCliqzSearchPref() == false) ||
-            (cliqzSearchController != nil && SettingsPrefs.shared.getCliqzSearchPref() == true){
+        let shouldShowCliqzSearch = SettingsPrefs.shared.getCliqzSearchPref() || UserPreferences.instance.showSearchOnboarding
+        if (searchController != nil && !shouldShowCliqzSearch) ||
+            (cliqzSearchController != nil && shouldShowCliqzSearch){
             return
         }
 
         searchLoader = SearchLoader(profile: profile, urlBar: urlBar)
         searchLoader!.addListener(HistoryListener.shared)
 
         // TODO:PK add telemetry
-        if SettingsPrefs.shared.getCliqzSearchPref() || UserPreferences.instance.showSearchOnboarding {
+        if shouldShowCliqzSearch {
             homePanelController?.view?.isHidden = true
 
             cliqzSearchController = CliqzSearchViewController(profile: self.profile)
@@ -1682,15 +1683,19 @@ extension BrowserViewController: URLBarDelegate {
             searchController?.searchQuery = text
             searchLoader?.query = text
 			*/
-			if !text.isEmpty {
-                cliqzSearchController?.searchQuery = text
-				searchController?.searchQuery = text
-				searchLoader?.query = text
-			}
+            self.updateSearchQuery(query: text)
 			// End Cliqz
         }
     }
 
+    func updateSearchQuery(query: String) {
+        if !query.isEmpty {
+            cliqzSearchController?.searchQuery = query
+            searchController?.searchQuery = query
+            searchLoader?.query = query
+        }
+    }
+
     func urlBar(_ urlBar: URLBarView, didSubmitText text: String) {
         guard let currentTab = tabManager.selectedTab else { return }
         if let fixupURL = URIFixup.getURL(text) {

Cliqz/Extensions/BrowserViewController/SearchViewDelegate.swift

@@ -25,7 +25,11 @@ extension BrowserViewController: SearchViewDelegate {
 	}
 
     func closeSearchOnboarding() {
+        let query = cliqzSearchController?.searchQuery
         hideSearchController()
         showSearchController()
+        if let query = query {
+            updateSearchQuery(query: query)
+        }
     }
 }