refactoring of bookmarks