More improvements to the way queries are enqueued in the PipeLine.