commit xss fix TQA-1802