pagination partial bug fix