Fix auto-completion for entities