DDBNEXT-842: Refactoring Bookmark logic