fix more pagination stuff