Fixed sorting without date