Better filtering potentially handling events