moved inclusion/exclusion check to composite_filter.match() from composite_filter.match_words()