Fixing unsubscribe logic in CLI