Update ethnicity to match NHS spec