new conditional unsubscribe support