After scuffle, sexual orientation question to stay on Census marketing survey