some fixes on the get_events method