Fixes some more pagination bugs