collection: improve instrumentation
collection: tweak instrumentation
promise: clean up `query` ref
test: added test for Collection#query