Add fallback to sort by name if equal