EXT-140: Resolve XSS security vulnerability