fix mixed no-namespace and default namespace handling