Add origin filter option
Remove faulty assumptions from auto extractor