Fixed Search Bug