fixed the Xss issue