Feature/typeahead update