Updated sort handlers with sophistication