SOS-1653 Fix XSS issue