Incremental improvements

1.- GroupBy -> OrderBy
2.- Having -> OrderBy