Events search bug fix