LPS-32031 Fix XSS