Improved groupyear list handling