Fix auto-complete keys