Completed fix for in-menu bookmarks