oops, revert fix
improved handling of 1-gram 'collocations'; added tags as distinguishing features