Refine events on return