more question routing fixes