Added some more logging messages and made the event filter less picky