Mustache attribute section fixes