Adjusted auto-complete behavior