Refactoring multi-tenant filters and resolvers.