LPS-45000 - Improve consistency in Bookmarks