Avoid a column unknown database error.
Change combined groupBy clause to two clauses. This avoids the query getting mangled by escaping.
Closes #3338647
Change combined groupBy clause to two clauses. This avoids the query getting mangled by escaping.
Closes #3338647