Update for autocomplete mode