Fix/order by issue