fixed watcher upload and observer