Update Pagination: fix some stuff