better handling of unigram groupings