Improve watcher urls