Sort by name if order is the same
Some work on the features stuff