Follow-up for for bug#10241 - make sure to handle Match settings differently.