892408 fix intermittent bookmarks resolution errors