Fix for XSS vulnerabilities

Used clean() to fix XSS vulnerabilities