Added additional GroupBy clause support for query expressions