queries are now more efficently rerun on any event