Fix issue where events show up for different orgs