ECMS-5428 fix the case activities duplicated and jumping