refactoring reader bookmark to show both bookmarks and highlights

This should fix #1209.