no issue # - fix couple more places where description is failing on nil template name.