fixes for blended component
template fixes