paginator refactor
paginator smoke