Stache conditionally nested components

Fixes the problems with stache @moschel identified.