Fixed resolve context: don't reuse result list