@David_Wong , I think for this use case we can use the nested filter feature added last year.
Check this out if this meets the requirement.