diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 39f10c4e51d12bccc6b25644535f08a33e0f1b9a..30aa8cc2b0932875c9f7932619653f8842beda8a 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -82,7 +82,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
       callbacks:
         notifyMOICreation:
           '{request.body#/notificationRecipientAddress}':
@@ -257,7 +257,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseGet'
     patch:
       summary: Patches one or multiple resources
       description: >-
@@ -314,7 +314,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
+                oneOf:
+                  - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
+                  - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponsePatch'
     delete:
       summary: Deletes one resource
       description: >-
@@ -331,7 +333,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
 components:
   schemas:
     CmNotificationTypes:
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index 88dbbd989655e24e03949bb20322941fd13bb635..e5da4cc47f52aaf90e4d90d166355f79664539bc 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -232,7 +232,7 @@ components:
 
     Filter:
       description: >-
-        The filter format shall be compliant to XPath 1.0.
+        The filter format shall be compliant to Jex (TS 32.161).
       type: string
     SystemDN:
       type: string
@@ -277,3 +277,126 @@ components:
           properties:
             errorInfo:
               type: string
+
+    ErrorResponseGet:
+      description: >-
+        Default schema for the response message body in case the Get
+        is not successful.
+      type: object
+      properties:
+        status:
+          type: string
+        type:
+          type: string
+        reason:
+          type: string
+        title:
+          type: string
+        badQueryParams:
+          type: array
+          items:
+            type: string
+        otherProblems:
+          type: array
+          items:
+            type: object
+            properties:
+              status:
+                type: string
+              type:
+                type: string
+              reason:
+                type: string
+              title:
+                type: string
+              badQueryParams:
+                type: array
+                items:
+                  type: string
+            required:
+              - type
+      required:
+        - type
+
+    ErrorResponseDefault:
+      type: object
+      properties:
+        status:
+          type: string
+        type:
+          type: string
+        reason:
+          type: string
+        title:
+          type: string
+        badAttributes:
+          type: array
+          items:
+            type: string
+        badObjects:
+          type: array
+          items:
+            type: string
+        otherProblems:
+          type: array
+          items:
+            type: object
+            properties:
+              status:
+                type: string
+              type:
+                type: string
+              reason:
+                type: string
+              title:
+                type: string
+              badAttributes:
+                type: array
+                items:
+                  type: string
+              badObjects:
+                type: array
+                items:
+                  type: string
+            required:
+              - type
+      required:
+        - type
+
+    ErrorResponsePatch:
+      description: >-
+        Default schema for the response message body in case the patch
+        is not successful.
+      type: object
+      properties:
+        status:
+          type: string
+        type:
+          type: string
+        reason:
+          type: string
+        title:
+          type: string
+        badOP:
+          type: string
+        otherProblems:
+          type: array
+          items:
+            type: object
+            properties:
+              status:
+                type: string
+              type:
+                type: string
+              reason:
+                type: string
+              title:
+                type: string
+              badOp:
+                type: string
+            required:
+              - type
+              - badOp
+      required:
+        - type
+        - badOp