Fixed issue with eventId case sensitivity