Bugfixes for watch page and routing.