Improve searching to pick if searching by name or nhi