LPS-42504 Fix XSS issue