page size and paging fixed (Done by Ammad)