FEND-1157 made sure that correct data was being used to determine if the label should be in singular or plural