Ironed out a few bugs around the dataset wrt plural representations of values