Fix-variables-again

[BenoitRanque]

This PR removes top level group by and order by clauses.
The order by has no effect, and the group by is actually incorrect here.

The group by was erroneously added because it was required for the order by, which itself should not have been there.

This meant foreach queries would return multiple rows, which was not desired behavior.