[BUG] Escaped GROUP BY clauses are double escaped (follow-up pull request #490)

Matched the behavior adopted for the ORDER clause to keep it consistent