Refactor GROUP BY clause, add extra columns for SQL compatibility, remove debugging...