Fix watcher query to work correctly with no watchers.