Removed XSS vulnerabilities

Removed several XSS vulnerabilities.