Added possibility to serve without templates
Fix potential problem with cli