now supports specification of match criteria on arbitrary fields

done