Updated paginate with 2 parallel queries