commit xss fix for TQA1802