Fixed XSS errors