story: 45756791 tree-structure fix + pbc responsive fix