Small tag fixups. Allow the bookmarks to be named.