Resolve XSS issues