Fix querying and indexing of event submission collections