Bugfixes - route, view generators