Added escape for HTML attributes