Updated to add search by client text field