Fixes of FilteredQueryExtractor