Finish search infrastructure