Fixed WITHIN GROUP ORDER BY extension