Iterating over all queries, not just the first one :). refs #454