Fix result set creation/pagination for v2.x