Fix typeahead issues on new making