Merge pull request #209 from writeas/fix-host-single-user-templates
Fix collection template issues introduced in #205