Added prevention against XSS