Added sort by aliased and joined entity