search updated with my changes and Cristian changes