Separated parsing of manually-prepared CSV to prioritise those values. Also improved handling of duplicated timeseries.