Fix client route and nextGroup route matching