Added failed event filter :P

continue refactoring...