Improved XSS protection