workorder and WOI improvements