Update to retry search. Removed init step