DDBNEXT-1012: Refactoring Bookmarkservice