paging issue fixes