Fixed hacky catchall by putting routes in order