more pagination fixes