fixed pagination issues (omg)