Fixed events, organizations queries

Fixes #24