fix on model escaping to avoid XSS