WIP: external template fetch fixes