Fix ethnic group and diagnosis validation