CAL-967 group related javascript
CAL-967 don't need to refresh if cancel or close popup