diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index cdfa486d45598e96b226fa0de15e90f57c58e129..b48192857f172290c2d355eaeba8d3752aa1ec34 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1571,7 +1571,7 @@ components:
                 scope:
                   $ref: '#/components/schemas/Scope'
                 notificationFilter:
-                  type: string
+                  $ref: 'comDefs.yaml#/components/schemas/Filter'                
             HeartbeatControl:
               $ref: '#/components/schemas/HeartbeatControl-Single'
     HeartbeatControl-Single:
@@ -1584,6 +1584,7 @@ components:
               properties:
                 heartbeatNtfPeriod:
                   type: integer
+                  minimum: 0
                 triggerHeartbeatNtf:
                   type: boolean
     TraceJob-Single: