CLOUD-118 Hievent type determination fixed