Fix DDC-2470
Fix CS
Merge pull request #332 from FabioBatSilva/DDC-2470

[DDC-2470, DDC-2441] Use column name instead of alias to modify order by clause