Fix ampersand encoding