Added FilteredQueryExtractor and FilterTermExtractor