handle year subsetting more cleanly