LPS-32031 Add additional XSS fix
LPS-32031 SF - Need to fix the calling end too
LPS-32031 Remove seemingly unneeded translation - might this be a copy/paste from roles?