Fix some ambiguities between year and monthday selectors
For single years, this needs to be part of the monthday selector, so we can have ranges with variable date selectors and a year. This means we have to exclude the single year case from the year selector and only use that for multi-year sets or ranges.