More event stuff
Search fixed