Fix AVNH multi-target notifiers and listeners