person + firm toggle fields added so search is easier, and adapted functions to that