diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index fa89dc852..59e746a5e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -578,7 +578,8 @@ namespace IRaCIS.Core.Application.Service
                 "select","radio","class",
             };
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
-                   .Where(x => types.Contains(x.Type))
+                 .Where(x => types.Contains(x.Type)||(x.Type=="number"&&x.TypeValue!=string.Empty))
+               
                 .WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
                  .Where(x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId)
 
@@ -672,10 +673,10 @@ namespace IRaCIS.Core.Application.Service
 
             var types = new List<string>()
             {
-                "select","radio"
+                "select","radio","class"
             };
             var questionList = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId)
-                   .Where(x => types.Contains(x.Type))
+                   .Where(x => types.Contains(x.Type) || (x.Type == "number" && x.TypeValue != string.Empty))
                 .WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
 
                 .Select(x => new CriterionOtherQuestionOutDto()