Fixed yet more xss vulnerabilities