Added search merged with develop

Added Search merged with develop