Reverted to one text field with autocomplete function.