Added support for ,  emulation in CLI mode, fixes to routing template