Add missing order_id field in group by