      (let ((note-attrs
             (enh-command-get-note-attrs-from-query
              query)))
-       (enh-update-note-attrs-external note-attrs)
+       (enh-set-note-attrs note-attrs)
        (enh-base-open-note-common (enh-base-read-note-attr note-attrs))))))
 
 

;; Helper functions for evernote-browsing-mode (enh-browsing-xxx)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(defvar enh-browsing-page-list nil
  "Page data list of evernote browsing mode.")
(make-variable-buffer-local 'enh-browsing-page-list)

(defvar enh-browsing-current-page nil
  "Current page data of evernote browsing mode.")
(make-variable-buffer-local 'enh-browsing-current-page)


(defun enh-browsing-open-tag (widget &rest ignored)
  "Open a tag in browsing mode"
  (let* ((guid (widget-value widget))
         (note-attrs
          (enh-command-get-note-attrs-from-tag-guids
           (if guid
               (list guid)
             nil))))
    (enh-set-note-attrs note-attrs)
    (enh-browsing-push-page
     (enh-browsing-create-page 'note-list
                               (format "Notes with tag %s"

          (setq edit-mode (enutil-aget 'edit-mode attr))))
    (setq attr
          (enh-command-update-note inbuf guid name tag-names edit-mode))
    (enh-update-note-and-new-tag-attrs attr)))


(defun enh-base-read-note-attr (note-attrs &optional display-completion)
