Updated typeahead