Some more fixes for Bookmarks Manager