diff --git a/IRaCIS.Core.Application/Resources/en-US.json b/IRaCIS.Core.Application/Resources/en-US.json
index acb2887..21e86b7 100644
--- a/IRaCIS.Core.Application/Resources/en-US.json
+++ b/IRaCIS.Core.Application/Resources/en-US.json
@@ -5,11 +5,11 @@
   "TrialService_OnlyInInitOrProgress": "Operations are allowed only when the project status is Ongoing.",
   "TrialService_ExistPN": "The same Project ID already exists",
 
-  "SubjectService_ExistSubjectCode": "Same patient ID has already existed.",
-  "SubjectService_ExistImage": "An image study has been uploaded for this patient, and the deletion of this patient is not allowed.",
+  "SubjectService_ExistSubjectCode": "The same patient ID has already existed.",
+  "SubjectService_ExistImage": "A Patient with any uploaded image study cannot be deleted.",
 
   "SubjectVisitServiece_ExistOtherInCurrent": "In the patient's study batch, there is an unplanned study batch after the previous study, please re-select the previous study.",
-  "SubjectVisitServiece_ExistName": "Same study batch name has already existed.",
+  "SubjectVisitServiece_ExistName": "The same study batch name has already existed.",
   "SubjectVisitServiece_ExistImage": "Images have already been uploaded in the current study batch, and deletion is not allowed.",
   "SubjectVisitServiece_HaveSetBeforeBatch": "The current study batch has been set to the previous study of another study and cannot be deleted.",
   "TrialResource_InterceptedProjectStatusRule": "This request is blocked by the configuration rule: The operation is allowed only when the project status is Ongoing.",
@@ -34,8 +34,8 @@
   "User_UsernameExist": "The user name already exists.",
   "User_PhoneDup": "A user with the same phone number already exists in this user type.",
   "User_EmailDup": "A user with the same email already exists in this user type.",
-  "User_NewOldPwdSame": "The new password is the same as the lasted old one.",
-  "User_OldPwdInvalid": "Failed to verify the old password.",
+  "User_NewOldPwdSame": "The new password is the same as the latest old one.",
+  "User_OldPwdInvalid": "The old password is wrong.",
   "User_LegalEmail": "Please input a legal email.",
   "User_VerificationCodeError": "The verification code is wrong.",
   "User_VerificationCodeExpired": "The verification code has expired.",
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 46e7dcb..b2227f0 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -461,7 +461,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<PageOutput<UserListDTO>> GetUserList(UserListQueryDTO param)
         {
-            var userQueryable = _userRepository.Where(x => x.UserTypeEnum != UserTypeEnum.NormalAdmin)
+            var userQueryable = _userRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
                   .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.UserName.Contains(param.UserName) )
                   .WhereIf(!string.IsNullOrWhiteSpace(param.RealName), t => t.FullName.Contains(param.RealName))
                   .WhereIf(!string.IsNullOrWhiteSpace(param.Phone), t => t.Phone.Contains(param.Phone))
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 3a46a8e..f78e7d3 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -1099,7 +1099,6 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand)
         {
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index e9a0fe7..d9c309e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1769,7 +1769,6 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto)
         {
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index c5538d8..d865b70 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -876,7 +876,7 @@ namespace IRaCIS.Core.Application
         [HttpPut("{trialId:guid}/{trialStatusStr}/{reason?}")]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.PM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt" })]
         public async Task<IResponseOutput> UpdateTrialState(Guid trialId, string trialStatusStr, string? reason)
         {