Updated to sort tags by name