Routes fixing

It works, plus we added questions ;)