LPS-42539 Fix XSS issues