added a few '*_contains' predicates (wherever there are already '*_pattern' predicates) to the policy mapping