Issue 10: XSS provisions
Issue 10: XSS provisions