Expiration bundle makes extra queries when there's a match

No need to query again if we got less results than the requested page size - this just makes an extra query that is 99.99999 percent guaranteed to return 0 results.

Also, might be worth transitioning this over to working off a stream instead of paged queries