Notifications: Improve channel detection