Merge "Change searches to do an upsert on insert()."