Fix filtering events on no containing class