Auto Completion improvements