Updated Typeahead Code