Tweak auto-complete