Must fix watcher functionality, further url quotes fixups