#54 fixes with counting amount for paging