CLI: Fixed autocompletion