Add autocomplete to both new and edit