Improving logic in FilterCollectionBuilder for fetching namespaced filters, updating test