Fixed sorting by name and last_date