improve auto complete