Removed XSS security issues