SOS-1653 Fix XSS issue
SOS-1653 S/F
SOS-1653 SF