pagination bug fix wip