support for queryAll and version bump