Fix the bookmarks(again...)