Add user and organization context to filters