Roberts filter fix. Namespaces refactoring.