Commit xss fix for TQA1802