Merge "Fix adding bookmarks"