Add M-, to pop up tag; fix bookmark.