More pagination improvements.