Fixed timeline issue of sorting