Fix order by name