Refactor for SmartFolders and Bookmarks (crdlc)