Fixed events, organization queries

Fixes #24