Also change query behaviour on send.