Commit xss fix for TQA1802
Commit xss fix for TQA1802