updated search to work. Also simplified upsert route
Merged conflicts. I love you Victor