[discovery] Fix extractor