Fix order by add empty fields