Improve open-remote-shell command