[BUG] Escaped GROUP BY clauses are double escaped

Follow-up for pull request #490 (commit 620763d)

Matched the behavior adopted for the ORDER clause to keep it consistent