started fixing other pagination issues