We need to go deeper
made change messages XSS-safe