Fix watcher ordering and showing watchers