2i: Improvements in pagination