Updated use of paginator (CO-762)