Fix bug with html entities in org name