fix for #417 - rules with tags and entities should match both, not either