Improve expand list autocomplete