Bug fixes and safeguards for adding events and querying extractions