added support for all bookmarks