Changed around supplement_search strategy.