Fixed order by date issue