improvements for bookmarks and table counter for bachelor format