improve auto-completion