Add a search method with only one arg

Also check isEmpty on the fields object