Trying to fix the XSS errors