bookmarks fixes