route matching tweaks