changed previous typeahead hack to a more checklist compliant typeahead hack