fixed empty events list handling