EventCase conversion improved