changes based on typeahead code review