Fix deconstruction of multi-parameter queries