Fixing mustache templates