Updated search bug