Upgrade find and replace to use decorations for marker views