clean entity handling and normalization
extract composite (hyphenated, underscored) tokens