Regression fix: fixes html text mangled due to scrubbing for security hacks
Adds fixes to the secuity fix