Fixing typeahead