Update to the search re-factoring. small fix