Improve auto-complete settings