Fixed autocomplete to deal with fast typing