Rework for multiplexed query