fix regex match/contains predicates