Better route matching