Refactored sorting so indicator now appears only on the field being sorted