Small changes before autocomplete attempt