Improve routing
Routing for questions