Fix namespace filtering.
Merge pull request #1805 from iocanel/namespace-fixes

Fix namespace filtering.