Refactor for SmartFolders and Bookmarks