Added ethnicity to risks (resolves OE-2565)