Fix Bug on search