Fix of sorting formatting problems