fix moduled underscore templates
merge