Pagination

Update pagination functionality with QueryParams-new.