I think the check for the bookmark icon is too optimistic, so the DB might not be updated by the time we check. Using try_until_success should fix this, we also don't have a toast to check against via AJAX success, by design.
contract
WithServiceHelper