CLSN-683 code review - July 1st
15. order by still missing on hierarchy