AutoComplete comment fix