[3.9] More improviements in live notifier