Got rid of the field value hash maps and added a SearchField object.