Fix sort -- and replace one with _.sortBy