Resolve criteria later in the request, to allow a compatibility fallback on older solvers