bookmarks bugfixes