CollapseByProperty feature updated