NYC: Correct label for Org Group & add Status to component list_fields