initial commit
fix paginator logic