Filters namespace rework