Improve YES/NO replacement