BUGFIX: The picker does not include all years in the drop down, so if a year is chosen that is not part of the current set, we create a new option and then choose it.