Bug fix where ordering by name breaks highlighting