search event fixes