Fixing the parsing, and the escpaing of the content