Change AutoCompleteSelectFields to new definition