Typeahead bug and grammar fix