can extract leafs from bubbles
fix some issues on aggregation