Fix additional pagination issue