diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index d3fb8663c99cbd71bad9f245e5f27accab4b7a03..ff9c3735d245f4ef71a802ff0830e321faf5a3f4 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -364,6 +364,21 @@ components:
       description: >-
         The filter format shall be compliant to Jex (TS 32.161).
       type: string
+    JexConditions:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex conditions profile specified in clause 7.6 of TS 32.161.
+    JexNodeSelectionBasic:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex basic profile specified in clause 7.4 of TS 32.161.
+    JexNodeSelectionAdvanced:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex advanced profile specified in clause 7.5 of TS 32.161.
     SystemDN:
       type: string
 
@@ -415,7 +430,7 @@ components:
         timeTick:
           type: integer
         filter:
-          $ref: '#/components/schemas/Filter'
+          $ref: '#/components/schemas/JexConditions'
 
     ErrorResponseGet:
       description: >-
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index 4e8a470a1a9c76a6141caf87eba34ffa344b9c2c..290043015af54098aef454357879f7406c3066db 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -42,7 +42,9 @@ components:
         - type: object
           properties:
             dataNodeSelector:
-              type: string
+              oneOf:
+                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
+                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'
 
 #-------- Definition of concrete IOCs --------------------------------------------         
     NtfSubscriptionControl-Single:
@@ -63,7 +65,7 @@ components:
                 scope:
                   $ref: '#/components/schemas/Scope'
                 notificationFilter:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'                
             HeartbeatControl:
               $ref: '#/components/schemas/HeartbeatControl-Single'
     HeartbeatControl-Single: