Fix years in date concept scheme, use string keys in dataset