bugid-97786 | WAM fixed xss - one more time