LPS-40286 Fix Bookmarks Subscription + Tests