Search bug fix