Replace !isEmpty by nonEmpty
Switch to batch sends after resolving