Pagination works when returning from another page [Bug Fixed]