Add more strictness to the route matching