More fixes for autocomplete button