Fix Race/Ethnicity lookup