xw - fix autocomplete issue