updated to do typeahead