fix paginator to use new API