Fix pagination with Manager