fix missing spaces in templates;