fixes for loops in order to fix the event listing