Fix for event create and search