Now detects and escapes unescaped ampersands