groupstree fixes