Potential search bug fix