Commands and notifications fix (multiple subscriptions support)