Fix duplicated routes in root namespace (work in progress)

Possible fix for #2049.