Fixed XSS issues