Added annotation filter to extractor