Various speed improvements in typeahead again