Improve auto complete behavior