Fix missing escape of GROUP BY and ORDER BY clause.