Revert to map-like watcher behavior and linear box update searches