Search added. Some minor changes applied.