Removed XSS vulnerabilities

Removed several XSS vulnerabilities.

What do you think about this update?