Fixed wrong groupBy and OrderBy rendering order