Allow empty template values in Sunstone (Take 2)