fix string and mustache handling