Fix not working node deletion from hierarchy via API
Minor changes
Fix template handling without grouping header