added search field and watch for complete status