additional typeahead support for #1721