ENSCORESW-138. Fixed the encoded entities by de-encoding them. Code is untested though and should be treated with caution