Bugs/pagination returns to first page