Improve extractors
Improve behavior of simple_extractor