Change subfield/indicator combo mechanism (to "requires-i1/-i2") and use to filter overeager revert matches