Fixed the events query
Merge branch 'master' into kingman