Revert "Fixed events, organizations queries"

This reverts commit acbe65abcaf1d2d7c9560037967a470476fc6ce4.