comments: toggle propagation fix and JS static move