Add `query` field to the output of the distance generator

I am surprised it is not there. I am pretty sure it has been there at some point (at least in certain branches, but may not be in master), because I have some experimental results that have the query names reported.