fix sort by