Move converted command name closer to command invocation.
Handle offline command without mode.
Minor syntax change on offline mode scenario.
Reversion to 1.1.0