Fixed Search bug