Fixed bad redirect behavior
Improving lookup performance on routes