[ticket/59] re-route requests when they look like they need it

Fix #59