Added searching for all fields and removed duplicates from results