Reorder the big Query matches for readability

[valencik]

There's a couple times we match on all Query types and they're getting a little scattered.