switched typed criteria to fields and adjusted names