SOS-1653 fixes XSS issue