Fix forced fetching of optional template name