Update to prevent XSS