Fix autocomplete to retain the current values