Added demographics fields selection