Refactor bookmarks/playlists