Improve auto complete behavior
Improve for manual completion