Fixed issue with inconsistent Tier ids/names