Improved pagination and performances