Further increase of XSS