Events data formation fix