Fix for Cross-site scripting (XSS)