pagination issue fixed