fix pagination. final commit for release 1.13.0