Fix sorting and unit name.