Use tree node instead of product categories #4656