Slight tweak to typeahead fix