some changes to include typeahead