[RFR] Fix js events