Fixes formating of optional event data