Attempt to fix pubsub. Only half working for paged queries.