Issues with repetitive replies on expand button click

[kelv (Kelvin T)]

Thanks for the PR @TethysPlex ! I’ve left a few comments on the PR in terms of simplifying the code but the overall approach is directionally there