I would add two subscriber predicates for those.