Fixing XSS vulnerability and single tag