Improved route matching by values
2.1.0