Fix bug around selecting race/gender