Few more fixes for Bookmarks Manager