Enhance autocomplete