Use getChildren from the tree instead of building groups with filterlist

Change-Id: I7d14a3c20bc22fae340542f293153d65af843887