SOS-1963 Fix XSS issues
SOS-1963 SF