     (enh-browsing-push-page
      (enh-browsing-create-page 'note-list
                                (format "Query Result of: %s" query)
-                               note-attrs))))
+                               note-attrs
+                               `(enh-command-get-note-attrs-from-query
+                                 ,query)))))
 
 
 (defun evernote-browsing-prev-page ()

                                           (enutil-aget 'name
                                                        (enh-get-tag-attr guid)))
                                 "All notes")
                               note-attrs))))


(defun enh-browsing-open-search (widget &rest ignored)

     (funcall enh-browsing-page-setup-func))))


(defun enh-browsing-create-page (type description &optional note-attrs refresh-closure)
  "Create a page structure of the attr-list"
  (let ((buf (generate-new-buffer (format "*ENB %s* " description))))
    (save-excursion
      (set-buffer buf)
      (setq enh-browsing-page-type type
            enh-browsing-page-description description
            enh-browsing-page-data note-attrs
            enh-browsing-page-data-refresh-closure refresh-closure)
      (cond
       ((eq type 'notebook-list)
        (setq enh-browsing-page-setup-func
