LPS-44554 Bookmarks fix