Better Autocomplete

Is that better with less commits?