better autocomplete support