merge conflicts
adding _search partial changes