LPS-35387 apply new datahandler pattern to bookmarks