Fix paging controls and isLastPage property