Fixed custom field handling of html entities.