Adding Search Logic !