Improve typeahead