Fixed wrong orderBy and groupBy rendering order
github scm