task #246: Shift service, fix sort by end date