resolved paginator bugs