Fix getEvents query to get current events
Some other fix