Yeah, I have never liked that you choose what you are querying before you select the source. I think the formatting here is so much more intuitive.