Refs #316 Attempts to fix the encoded entities but I don't think this works. More testing is required.