Another improvements. Fixed bugs in paging.