Updated GenericNotificationProducer and filter handling to better fit the spec