Restored generic handling of fields by label.