Fixed autocomplete (actually)