Hierarchies and Templatings fixes