Fixed AddEditEvent bugs