MOB-711 Improved getEvents method