Fixing some more evidence sources to stop observing (only) specific notifications