Slove issue and working on search Algo
merge issues