Make query versions actually work for realsies.
Add commment.