fix sort + order by