Choice filter based on two conditions at once

Maybe sharing your xlsform with the community would be helpful.