Fix Search Bug not implemented yet