Add better handling for namespaces

I realized, in the process of doing other url work, that namespaces weren't considered. 🤦🏻

This isn't a huge deal, but we probably want to include in the next release.