order by date fix