fix Search Bug