Pagination is now handled more gracefully