Fix unescaped ampersands