Consistency fix between autocomplete name and id