Cmd: better mimic the old autocompletion behavior