Html escape fixes