Show app name in output when no choice, fix #1025