Added check for Enroll Status & fixed Ethnicity.