Fix Search Bug