fixes in mustache template