Added html parsing to reduce the chance of XSS