Updated search extractor to right number