#6513 incomplete hub-wide tag changes, and incorrect alphabetization -part 2