improve WO and IVI handling