     (setq enh-browsing-page-widget-root nil))
   (when (and (null enh-browsing-page-data)
              enh-browsing-page-data-refresh-closure)
-    (let (note-attrs
-          (attrs-func (car enh-browsing-page-data-refresh-closure))
-          (attrs-args (cdr enh-browsing-page-data-refresh-closure)))
-      (setq note-attrs (apply attrs-func attrs-args))
-      (setq enh-browsing-page-data note-attrs)))
+    (setq enh-browsing-page-data (funcall enh-browsing-page-data-refresh-closure)))
   (let ((note-attrs enh-browsing-page-data)
         (note-list nil))
     (mapc

                                                        (enh-get-tag-attr guid)))
                                 "All notes")
                               note-attrs
                               `(enh-command-get-note-attrs-from-notebook-and-tag-guids
                                 nil ,(if guid
                                          (list guid)
                                        nil))))))


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

                                (format "Query Result of Saved Search: %s"
                                        (enutil-aget 'name search-attr))
                                note-attrs
                                `(lambda () (enh-command-get-note-attrs-from-query
                                             ,(enutil-aget 'query search-attr))))
      t))))


