More demo fixing.
Fixing a bug with Template#fetchSubTemplates