Fix so that typeahead is compatible with mask