Update watcher + restore with search_root