now supports specification of match criteria on arbitrary fields

Can you delete this line?