LPS-45612 - Fixing XSS