More fixes to pagination