Solved pagination issues