Modified filter to pick for all values instead of First Name only