Fixing typeahead...