I don't know if the survey is only for US or international, but in France we don't do racial survey( since we are all equal skin color shouldn't matter, so we don't ask. A little hypocritical, I know), maybe you could give an option not to answer to the question 17, like you did for the salary ?