diff --git a/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js b/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js
index 0735102b..901d97f7 100644
--- a/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js
+++ b/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js
@@ -157,15 +157,20 @@ function convertAllQueryToDICOMTag(iParam) {
                 newKeyNames.push(keyNameSplit[x]);
             }
         }
+        let retKeyName;
         if (newKeyNames.length === 0) {
             throw new DicomWebServiceError(
                 DicomWebStatusCodes.InvalidArgumentValue,
                 `Invalid request query: ${keyNameSplit}`,
                 400
             );
-        };
-        newKeyNames.push("Value");
-        let retKeyName = newKeyNames.join(".");
+        } else if (newKeyNames.length >= 2) {
+            retKeyName = newKeyNames.map(v => v + ".Value").join(".");
+        } else {
+            newKeyNames.push("Value");
+            retKeyName = newKeyNames.join(".");
+        }
+        
         newQS[retKeyName] = iParam[keyName];
     }
     return newQS;