Typeahead works better now