CC-4894: Need to filter output for potential XSS exploits

-fixed few areas