Small FindAndReplace improvement