Fix bug(s) in eventmanager filter