Search added

Need to fix replace mechanism