Correct EventMapping query