            (define-key map (kbd "s") (lambda ()
                                        (interactive)
                                        (let ((helm-ag-insert-at-point 'symbol))
-                                         (spacemacs/helm-smart-do-search))))
+                                         (spacemacs/helm-files-smart-do-search))))
            map) nil)
         (let* ((i 0)
                (overlay-count (length ahs-overlay-list))

        "bsp" 'spacemacs/helm-buffers-do-pt-region-or-symbol
        "bsP" 'spacemacs/helm-buffers-do-pt
        ;; files scope
        "f/"  'spacemacs/helm-smart-do-search-region-or-symbol
        "f?"  'spacemacs/helm-smart-do-search
        "fsa" 'spacemacs/helm-do-ag-region-or-symbol
        "fsA" 'helm-do-ag
        "fsk" 'spacemacs/helm-do-ack-region-or-symbol
        "fsK" 'spacemacs/helm-do-ack
        "fsp" 'spacemacs/helm-do-pt-region-or-symbol
        "fsP" 'spacemacs/helm-do-pt
        ;; current project scope
        "p/"  'spacemacs/helm-project-smart-do-search-region-or-symbol
        "p?"  'spacemacs/helm-project-smart-do-search

                        (this-fn thing)))))
          (funcall func dir)))

      (defun spacemacs//helm-do-search-find-tool (base tools default-inputp)
        "Create a cond form given a TOOLS string list and evaluate it."
        (eval
