Upgrade find and replace to have cmd-d undo and skip