+ updates to how the next page tokens are stored
+ updates to *when* the next page tokens are stored