Upgrade find-and-replace