diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6852529b..c7b3e641 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,17 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.0-RC.3 Fix typo in AcademicSessionCourseOfferingCollection.yaml] - 2026-07-14
+
+### Fixed
+- Fixed the `AcademicSessionCourseCollection` response schema by correctly defining `items` as an array of `CourseOffer` objects.
+
+## [6.0-RC.3 Solved filter parameter issue] - 2026-07-09
+
+### Fixed
+- Merged the filter_query and filter_query[__or][] parameter definitions into a single filter_query parameter to clarify deepObject encoding.
+
+## [6.0-RC.3 Solved content-type issue] - 2026-07-09
+
+### Fixed
+- Content-type updated to application/vnd.oeapi+json
+
 ## [6.1-RC.1 (main) Date-time attributes on education specifications ] - 2026-06-17
 
 ### Added
 - Added FirstPossibleOfferingStartDateTime to Programme, Course, LearningComponent and TestComponent
 - Added LastPossibleOfferingStartDateTime to Programme, Course, LearningComponent and TestComponent
 - Added lastPossibleOfferingEndDateTime to Programme, Course, LearningComponent and TestComponent
+
 ## [6.1-RC.1 Replace RFC 7807 with RFC 9457] - 2026-06-18
 
 ### fixed
 - Replace RFC 7807 with RFC 9457 for errorhandling.
 
+## [6.0-RC.3 Solved documentation issue] - 2026-05-12
+
+### Fixed
+- Added alphabetical sorting of `components.schemas` in the Zudoku preprocessor.
+
 ## [6.1-RC.1 (main) Update based on missing features for(Dutch) OKE project] - 2026-04-07
 
 ### Fixed
diff --git a/redocly.yaml b/redocly.yaml
index 49fff124..cdf43371 100644
--- a/redocly.yaml
+++ b/redocly.yaml
@@ -13,7 +13,7 @@ rules:
   response-mime-type:
     severity: error
     allowedValues:
-      - application/json
+      - application/vnd.oeapi+json
       - application/problem+json
       - application/octet-stream
       - application/merge-patch+json
@@ -21,7 +21,7 @@ rules:
   request-mime-type:
     severity: error
     allowedValues:
-      - application/json
+      - application/vnd.oeapi+json
       - application/problem+json
       - application/octet-stream
       - application/merge-patch+json
diff --git a/source/paths/AcademicSessionCollection.yaml b/source/paths/AcademicSessionCollection.yaml
index 16f3651c..92bbe933 100644
--- a/source/paths/AcademicSessionCollection.yaml
+++ b/source/paths/AcademicSessionCollection.yaml
@@ -35,7 +35,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/AcademicSessionCourseOfferingCollection.yaml b/source/paths/AcademicSessionCourseOfferingCollection.yaml
index 3747ded6..7ffe00a8 100644
--- a/source/paths/AcademicSessionCourseOfferingCollection.yaml
+++ b/source/paths/AcademicSessionCourseOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
@@ -53,7 +53,9 @@ get:
                   - items
                 properties:
                   items:
-                    $ref: '../schemas/CourseOffering.yaml'
+                    type: array
+                    items:
+                      $ref: '../schemas/CourseOffering.yaml'
                   ext:
                       $ref: '../schemas/Ext.yaml'
     '400':
diff --git a/source/paths/AcademicSessionInstance.yaml b/source/paths/AcademicSessionInstance.yaml
index a655016b..d86ba930 100644
--- a/source/paths/AcademicSessionInstance.yaml
+++ b/source/paths/AcademicSessionInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/AcademicSession.yaml'
     '400':
diff --git a/source/paths/AcademicSessionLearningComponentOfferingCollection.yaml b/source/paths/AcademicSessionLearningComponentOfferingCollection.yaml
index 3db24cdf..35d4ee63 100644
--- a/source/paths/AcademicSessionLearningComponentOfferingCollection.yaml
+++ b/source/paths/AcademicSessionLearningComponentOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/AcademicSessionProgrammeOfferingCollection.yaml b/source/paths/AcademicSessionProgrammeOfferingCollection.yaml
index 8708272d..65bad6b2 100644
--- a/source/paths/AcademicSessionProgrammeOfferingCollection.yaml
+++ b/source/paths/AcademicSessionProgrammeOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/AcademicSessionTestComponentOfferingCollection.yaml b/source/paths/AcademicSessionTestComponentOfferingCollection.yaml
index b1e58c1e..0b36f447 100644
--- a/source/paths/AcademicSessionTestComponentOfferingCollection.yaml
+++ b/source/paths/AcademicSessionTestComponentOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/BuildingCollection.yaml b/source/paths/BuildingCollection.yaml
index 1679ba62..852df199 100644
--- a/source/paths/BuildingCollection.yaml
+++ b/source/paths/BuildingCollection.yaml
@@ -16,7 +16,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/BuildingInstance.yaml b/source/paths/BuildingInstance.yaml
index 53c63d0b..1b4ccc9f 100644
--- a/source/paths/BuildingInstance.yaml
+++ b/source/paths/BuildingInstance.yaml
@@ -18,7 +18,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Building.yaml'
     '400':
diff --git a/source/paths/BuildingRoomCollection.yaml b/source/paths/BuildingRoomCollection.yaml
index f2fbc255..2e7d3f74 100644
--- a/source/paths/BuildingRoomCollection.yaml
+++ b/source/paths/BuildingRoomCollection.yaml
@@ -28,7 +28,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseCollection.yaml b/source/paths/CourseCollection.yaml
index 0577e139..8e6a29c3 100644
--- a/source/paths/CourseCollection.yaml
+++ b/source/paths/CourseCollection.yaml
@@ -29,7 +29,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseCourseOfferingCollection.yaml b/source/paths/CourseCourseOfferingCollection.yaml
index 721804eb..1ab15e78 100644
--- a/source/paths/CourseCourseOfferingCollection.yaml
+++ b/source/paths/CourseCourseOfferingCollection.yaml
@@ -50,7 +50,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseInstance.yaml b/source/paths/CourseInstance.yaml
index d1830280..1d039709 100644
--- a/source/paths/CourseInstance.yaml
+++ b/source/paths/CourseInstance.yaml
@@ -34,7 +34,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/CourseExpanded.yaml'
     '400':
diff --git a/source/paths/CourseLearningComponentCollection.yaml b/source/paths/CourseLearningComponentCollection.yaml
index 09c5dc4a..171c88a1 100644
--- a/source/paths/CourseLearningComponentCollection.yaml
+++ b/source/paths/CourseLearningComponentCollection.yaml
@@ -23,7 +23,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseLearningComponentOfferingCollection.yaml b/source/paths/CourseLearningComponentOfferingCollection.yaml
index a02c81cf..bbbb7e9a 100644
--- a/source/paths/CourseLearningComponentOfferingCollection.yaml
+++ b/source/paths/CourseLearningComponentOfferingCollection.yaml
@@ -66,7 +66,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseOfferingAssociationInstance.yaml b/source/paths/CourseOfferingAssociationInstance.yaml
index 85bfd001..fbde6817 100644
--- a/source/paths/CourseOfferingAssociationInstance.yaml
+++ b/source/paths/CourseOfferingAssociationInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/CourseOfferingAssociation.yaml'          
     '400':
@@ -70,7 +70,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/CourseOfferingAssociation.yaml'
   responses:
@@ -144,7 +144,7 @@ patch:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/CourseOfferingAssociationInstanceExternalMe.yaml b/source/paths/CourseOfferingAssociationInstanceExternalMe.yaml
index 5c9b94f2..0333dbc1 100644
--- a/source/paths/CourseOfferingAssociationInstanceExternalMe.yaml
+++ b/source/paths/CourseOfferingAssociationInstanceExternalMe.yaml
@@ -19,7 +19,7 @@ post:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           required:
             - remoteState
@@ -33,7 +33,7 @@ post:
     '201':
       description: Created
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/CourseOfferingCourseOfferingAssociationCollection.yaml b/source/paths/CourseOfferingCourseOfferingAssociationCollection.yaml
index 157179da..8d383271 100644
--- a/source/paths/CourseOfferingCourseOfferingAssociationCollection.yaml
+++ b/source/paths/CourseOfferingCourseOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseOfferingGroupCollection.yaml b/source/paths/CourseOfferingGroupCollection.yaml
index 4d05c347..de6ae5bb 100644
--- a/source/paths/CourseOfferingGroupCollection.yaml
+++ b/source/paths/CourseOfferingGroupCollection.yaml
@@ -28,7 +28,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseOfferingInstance.yaml b/source/paths/CourseOfferingInstance.yaml
index 51618e62..b10e2275 100644
--- a/source/paths/CourseOfferingInstance.yaml
+++ b/source/paths/CourseOfferingInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/CourseOffering.yaml'
             title: courseOffering
@@ -72,7 +72,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/CourseOffering.yaml'
 
@@ -121,7 +121,7 @@ patch:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/CourseOffering.yaml'
 
diff --git a/source/paths/CourseOfferingLearningComponentOfferingCollection.yaml b/source/paths/CourseOfferingLearningComponentOfferingCollection.yaml
index 26073080..89947160 100644
--- a/source/paths/CourseOfferingLearningComponentOfferingCollection.yaml
+++ b/source/paths/CourseOfferingLearningComponentOfferingCollection.yaml
@@ -43,7 +43,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseOfferingTestComponentOfferingCollection.yaml b/source/paths/CourseOfferingTestComponentOfferingCollection.yaml
index 64799d08..9132ca09 100644
--- a/source/paths/CourseOfferingTestComponentOfferingCollection.yaml
+++ b/source/paths/CourseOfferingTestComponentOfferingCollection.yaml
@@ -43,7 +43,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseTestComponentCollection.yaml b/source/paths/CourseTestComponentCollection.yaml
index 2dcb7684..512fc46d 100644
--- a/source/paths/CourseTestComponentCollection.yaml
+++ b/source/paths/CourseTestComponentCollection.yaml
@@ -23,7 +23,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/CourseTestComponentOfferingCollection.yaml b/source/paths/CourseTestComponentOfferingCollection.yaml
index 7e27fe92..9e9b3cc7 100644
--- a/source/paths/CourseTestComponentOfferingCollection.yaml
+++ b/source/paths/CourseTestComponentOfferingCollection.yaml
@@ -50,7 +50,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/GroupCollection.yaml b/source/paths/GroupCollection.yaml
index e377e271..c395f6d7 100644
--- a/source/paths/GroupCollection.yaml
+++ b/source/paths/GroupCollection.yaml
@@ -22,7 +22,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/GroupInstance.yaml b/source/paths/GroupInstance.yaml
index dd083f39..a0701e97 100644
--- a/source/paths/GroupInstance.yaml
+++ b/source/paths/GroupInstance.yaml
@@ -30,7 +30,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Group.yaml'
     '400':
@@ -68,7 +68,7 @@ put:
   requestBody:
     required: true
     content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Group.yaml'
             title: group
diff --git a/source/paths/GroupMemberships.yaml b/source/paths/GroupMemberships.yaml
index 6e2c607f..eacbe301 100644
--- a/source/paths/GroupMemberships.yaml
+++ b/source/paths/GroupMemberships.yaml
@@ -21,7 +21,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/LearningComponentCollection.yaml b/source/paths/LearningComponentCollection.yaml
index e5a61b98..be7fac78 100644
--- a/source/paths/LearningComponentCollection.yaml
+++ b/source/paths/LearningComponentCollection.yaml
@@ -22,7 +22,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/LearningComponentInstance.yaml b/source/paths/LearningComponentInstance.yaml
index 678e3f55..d979a5dd 100644
--- a/source/paths/LearningComponentInstance.yaml
+++ b/source/paths/LearningComponentInstance.yaml
@@ -31,7 +31,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/LearningComponent.yaml'
     '400':
diff --git a/source/paths/LearningComponentLearningComponentOfferingCollection.yaml b/source/paths/LearningComponentLearningComponentOfferingCollection.yaml
index 4226708d..f6217667 100644
--- a/source/paths/LearningComponentLearningComponentOfferingCollection.yaml
+++ b/source/paths/LearningComponentLearningComponentOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/LearningComponentOfferingAssociationInstance.yaml b/source/paths/LearningComponentOfferingAssociationInstance.yaml
index a382fd39..da05613c 100644
--- a/source/paths/LearningComponentOfferingAssociationInstance.yaml
+++ b/source/paths/LearningComponentOfferingAssociationInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/LearningComponentOfferingAssociation.yaml'          
     '400':
@@ -70,7 +70,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/LearningComponentOfferingAssociation.yaml'
         examples:
@@ -199,7 +199,7 @@ patch:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/LearningComponentOfferingGroupCollection.yaml b/source/paths/LearningComponentOfferingGroupCollection.yaml
index a5498b6a..3c00285f 100644
--- a/source/paths/LearningComponentOfferingGroupCollection.yaml
+++ b/source/paths/LearningComponentOfferingGroupCollection.yaml
@@ -28,7 +28,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/LearningComponentOfferingInstance.yaml b/source/paths/LearningComponentOfferingInstance.yaml
index 3955c984..a0adde43 100644
--- a/source/paths/LearningComponentOfferingInstance.yaml
+++ b/source/paths/LearningComponentOfferingInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/LearningComponentOffering.yaml'
     '400':
@@ -70,7 +70,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/LearningComponentOffering.yaml'
 
@@ -119,7 +119,7 @@ patch:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/LearningComponentOffering.yaml'
 
diff --git a/source/paths/LearningComponentOfferingLearningComponentOfferingAssociationCollection.yaml b/source/paths/LearningComponentOfferingLearningComponentOfferingAssociationCollection.yaml
index ea94f6f7..e89fe262 100644
--- a/source/paths/LearningComponentOfferingLearningComponentOfferingAssociationCollection.yaml
+++ b/source/paths/LearningComponentOfferingLearningComponentOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/LearningOutcomeCollection.yaml b/source/paths/LearningOutcomeCollection.yaml
index 16d73522..748fe559 100644
--- a/source/paths/LearningOutcomeCollection.yaml
+++ b/source/paths/LearningOutcomeCollection.yaml
@@ -29,7 +29,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/LearningOutcomeInstance.yaml b/source/paths/LearningOutcomeInstance.yaml
index 792c63d0..aa5e997a 100644
--- a/source/paths/LearningOutcomeInstance.yaml
+++ b/source/paths/LearningOutcomeInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/LearningOutcome.yaml'
     '400':
diff --git a/source/paths/OrganisationCollection.yaml b/source/paths/OrganisationCollection.yaml
index 94943a2f..a83a2a8f 100644
--- a/source/paths/OrganisationCollection.yaml
+++ b/source/paths/OrganisationCollection.yaml
@@ -22,7 +22,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationCourseCollection.yaml b/source/paths/OrganisationCourseCollection.yaml
index 7acb3bdc..ede231a1 100644
--- a/source/paths/OrganisationCourseCollection.yaml
+++ b/source/paths/OrganisationCourseCollection.yaml
@@ -34,7 +34,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationCourseOfferingCollection.yaml b/source/paths/OrganisationCourseOfferingCollection.yaml
index 38fbb371..be99d192 100644
--- a/source/paths/OrganisationCourseOfferingCollection.yaml
+++ b/source/paths/OrganisationCourseOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationGroupCollection.yaml b/source/paths/OrganisationGroupCollection.yaml
index 038d53f9..ed5c4d59 100644
--- a/source/paths/OrganisationGroupCollection.yaml
+++ b/source/paths/OrganisationGroupCollection.yaml
@@ -28,7 +28,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationInstance.yaml b/source/paths/OrganisationInstance.yaml
index 2a8490fd..3a1b050c 100644
--- a/source/paths/OrganisationInstance.yaml
+++ b/source/paths/OrganisationInstance.yaml
@@ -31,7 +31,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Organisation.yaml'
     '400':
@@ -69,7 +69,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/Organisation.yaml'
 
diff --git a/source/paths/OrganisationLearningComponentCollection.yaml b/source/paths/OrganisationLearningComponentCollection.yaml
index 34bba24b..92c516f7 100644
--- a/source/paths/OrganisationLearningComponentCollection.yaml
+++ b/source/paths/OrganisationLearningComponentCollection.yaml
@@ -23,7 +23,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationLearningComponentOfferingCollection.yaml b/source/paths/OrganisationLearningComponentOfferingCollection.yaml
index 5bd0a1d1..cd7b1dc3 100644
--- a/source/paths/OrganisationLearningComponentOfferingCollection.yaml
+++ b/source/paths/OrganisationLearningComponentOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationProgrammeCollection.yaml b/source/paths/OrganisationProgrammeCollection.yaml
index f6189c99..d1de5cf1 100644
--- a/source/paths/OrganisationProgrammeCollection.yaml
+++ b/source/paths/OrganisationProgrammeCollection.yaml
@@ -47,7 +47,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationProgrammeOfferingCollection.yaml b/source/paths/OrganisationProgrammeOfferingCollection.yaml
index 13309134..b802d7c0 100644
--- a/source/paths/OrganisationProgrammeOfferingCollection.yaml
+++ b/source/paths/OrganisationProgrammeOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationTestComponentCollection.yaml b/source/paths/OrganisationTestComponentCollection.yaml
index cd6eb506..805c278d 100644
--- a/source/paths/OrganisationTestComponentCollection.yaml
+++ b/source/paths/OrganisationTestComponentCollection.yaml
@@ -23,7 +23,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/OrganisationTestComponentOfferingCollection.yaml b/source/paths/OrganisationTestComponentOfferingCollection.yaml
index 8e72d39d..600af5d9 100644
--- a/source/paths/OrganisationTestComponentOfferingCollection.yaml
+++ b/source/paths/OrganisationTestComponentOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/PersonCollection.yaml b/source/paths/PersonCollection.yaml
index 1443ce26..45656d7b 100644
--- a/source/paths/PersonCollection.yaml
+++ b/source/paths/PersonCollection.yaml
@@ -22,7 +22,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
@@ -62,7 +62,7 @@ post:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/PersonProperties.yaml'
@@ -72,7 +72,7 @@ post:
     '201':
       description: Created
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/PersonId.yaml'
diff --git a/source/paths/PersonCourseOfferingAssociationCollection.yaml b/source/paths/PersonCourseOfferingAssociationCollection.yaml
index a0c2d02f..4f7f8864 100644
--- a/source/paths/PersonCourseOfferingAssociationCollection.yaml
+++ b/source/paths/PersonCourseOfferingAssociationCollection.yaml
@@ -52,7 +52,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/PersonGroupMemberships.yaml b/source/paths/PersonGroupMemberships.yaml
index c9509e2f..181a8271 100644
--- a/source/paths/PersonGroupMemberships.yaml
+++ b/source/paths/PersonGroupMemberships.yaml
@@ -24,7 +24,7 @@ put:
   requestBody:
     required: true
     content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Membership.yaml'
             title: membership
diff --git a/source/paths/PersonInstance.yaml b/source/paths/PersonInstance.yaml
index 33ff46d8..805652c2 100644
--- a/source/paths/PersonInstance.yaml
+++ b/source/paths/PersonInstance.yaml
@@ -18,7 +18,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Person.yaml'
     '400':
@@ -58,7 +58,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/Person.yaml'
 
diff --git a/source/paths/PersonLearningComponentOfferingAssociationCollection.yaml b/source/paths/PersonLearningComponentOfferingAssociationCollection.yaml
index d8273a98..548b3780 100644
--- a/source/paths/PersonLearningComponentOfferingAssociationCollection.yaml
+++ b/source/paths/PersonLearningComponentOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/PersonMe.yaml b/source/paths/PersonMe.yaml
index 0fecd8aa..1683aa93 100644
--- a/source/paths/PersonMe.yaml
+++ b/source/paths/PersonMe.yaml
@@ -17,7 +17,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Person.yaml'
     '400':
diff --git a/source/paths/PersonProgrammeOfferingAssociationCollection.yaml b/source/paths/PersonProgrammeOfferingAssociationCollection.yaml
index 31275718..ca5b6195 100644
--- a/source/paths/PersonProgrammeOfferingAssociationCollection.yaml
+++ b/source/paths/PersonProgrammeOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/PersonTestComponentOfferingAssociationCollection.yaml b/source/paths/PersonTestComponentOfferingAssociationCollection.yaml
index 94f804ce..f034b9e1 100644
--- a/source/paths/PersonTestComponentOfferingAssociationCollection.yaml
+++ b/source/paths/PersonTestComponentOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/ProgrammeCollection.yaml b/source/paths/ProgrammeCollection.yaml
index b2e60a13..5145860c 100644
--- a/source/paths/ProgrammeCollection.yaml
+++ b/source/paths/ProgrammeCollection.yaml
@@ -41,7 +41,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/ProgrammeCourseCollection.yaml b/source/paths/ProgrammeCourseCollection.yaml
index 56bdc735..ab9f2187 100644
--- a/source/paths/ProgrammeCourseCollection.yaml
+++ b/source/paths/ProgrammeCourseCollection.yaml
@@ -35,7 +35,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/ProgrammeInstance.yaml b/source/paths/ProgrammeInstance.yaml
index eade1487..bd9f76c6 100644
--- a/source/paths/ProgrammeInstance.yaml
+++ b/source/paths/ProgrammeInstance.yaml
@@ -35,7 +35,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/ProgrammeExpanded.yaml'
     '400':
diff --git a/source/paths/ProgrammeOfferingAssociationInstance.yaml b/source/paths/ProgrammeOfferingAssociationInstance.yaml
index a47dd372..b305638c 100644
--- a/source/paths/ProgrammeOfferingAssociationInstance.yaml
+++ b/source/paths/ProgrammeOfferingAssociationInstance.yaml
@@ -31,7 +31,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/ProgrammeOfferingAssociation.yaml'          
     '400':
@@ -69,7 +69,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/ProgrammeOfferingAssociation.yaml'
 
@@ -143,7 +143,7 @@ patch:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/ProgrammeOfferingAssociationInstanceExternalMe.yaml b/source/paths/ProgrammeOfferingAssociationInstanceExternalMe.yaml
index dcc04e8c..8048521b 100644
--- a/source/paths/ProgrammeOfferingAssociationInstanceExternalMe.yaml
+++ b/source/paths/ProgrammeOfferingAssociationInstanceExternalMe.yaml
@@ -18,7 +18,7 @@ post:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           required:
             - remoteState
@@ -32,7 +32,7 @@ post:
     '201':
       description: CREATED
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/ProgrammeOfferingCollection.yaml b/source/paths/ProgrammeOfferingCollection.yaml
index 075e667f..f68e89fd 100644
--- a/source/paths/ProgrammeOfferingCollection.yaml
+++ b/source/paths/ProgrammeOfferingCollection.yaml
@@ -50,7 +50,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/ProgrammeOfferingGroupCollection.yaml b/source/paths/ProgrammeOfferingGroupCollection.yaml
index 2eff9256..2b8ce03b 100644
--- a/source/paths/ProgrammeOfferingGroupCollection.yaml
+++ b/source/paths/ProgrammeOfferingGroupCollection.yaml
@@ -28,7 +28,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/ProgrammeOfferingInstance.yaml b/source/paths/ProgrammeOfferingInstance.yaml
index 473bda94..8fe09fff 100644
--- a/source/paths/ProgrammeOfferingInstance.yaml
+++ b/source/paths/ProgrammeOfferingInstance.yaml
@@ -37,7 +37,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/ProgrammeOffering.yaml'
             title: programmeOffering
@@ -77,7 +77,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/ProgrammeOffering.yaml'
 
@@ -126,7 +126,7 @@ patch:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/ProgrammeOffering.yaml'
 
diff --git a/source/paths/ProgrammeOfferingProgrammeOfferingAssociationCollection.yaml b/source/paths/ProgrammeOfferingProgrammeOfferingAssociationCollection.yaml
index fea277dd..4d678872 100644
--- a/source/paths/ProgrammeOfferingProgrammeOfferingAssociationCollection.yaml
+++ b/source/paths/ProgrammeOfferingProgrammeOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/ProgrammeProgrammeCollection.yaml b/source/paths/ProgrammeProgrammeCollection.yaml
index 8b1ea30c..6a24a637 100644
--- a/source/paths/ProgrammeProgrammeCollection.yaml
+++ b/source/paths/ProgrammeProgrammeCollection.yaml
@@ -47,7 +47,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/RoomCollection.yaml b/source/paths/RoomCollection.yaml
index 3e44e875..c3daccdc 100644
--- a/source/paths/RoomCollection.yaml
+++ b/source/paths/RoomCollection.yaml
@@ -22,7 +22,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/RoomInstance.yaml b/source/paths/RoomInstance.yaml
index ea279719..595aafad 100644
--- a/source/paths/RoomInstance.yaml
+++ b/source/paths/RoomInstance.yaml
@@ -30,7 +30,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Room.yaml'
     '400':
diff --git a/source/paths/Service.yaml b/source/paths/Service.yaml
index fb34b1fe..b2e1bf40 100644
--- a/source/paths/Service.yaml
+++ b/source/paths/Service.yaml
@@ -9,7 +9,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Service.yaml'
     '400':
diff --git a/source/paths/TestComponentCollection.yaml b/source/paths/TestComponentCollection.yaml
index daf1f953..1420a7cc 100644
--- a/source/paths/TestComponentCollection.yaml
+++ b/source/paths/TestComponentCollection.yaml
@@ -22,7 +22,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/TestComponentInstance.yaml b/source/paths/TestComponentInstance.yaml
index b59a54c7..67d0b5d7 100644
--- a/source/paths/TestComponentInstance.yaml
+++ b/source/paths/TestComponentInstance.yaml
@@ -31,7 +31,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/TestComponent.yaml'
     '400':
diff --git a/source/paths/TestComponentOfferingAssociationAttemptCollection.yaml b/source/paths/TestComponentOfferingAssociationAttemptCollection.yaml
index 11a95533..50bfe3de 100644
--- a/source/paths/TestComponentOfferingAssociationAttemptCollection.yaml
+++ b/source/paths/TestComponentOfferingAssociationAttemptCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/TestComponentOfferingAssociationAttemptInstance.yaml b/source/paths/TestComponentOfferingAssociationAttemptInstance.yaml
index 3e960217..b7e3f6d1 100644
--- a/source/paths/TestComponentOfferingAssociationAttemptInstance.yaml
+++ b/source/paths/TestComponentOfferingAssociationAttemptInstance.yaml
@@ -18,7 +18,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/TestComponentOfferingAssociationAttemptFull.yaml'          
     '400':
@@ -57,7 +57,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/TestComponentOfferingAssociationAttemptFull.yaml'
 
@@ -124,7 +124,7 @@ patch:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/TestComponentOfferingAssociationAttemptOnAssociationInstance.yaml b/source/paths/TestComponentOfferingAssociationAttemptOnAssociationInstance.yaml
index 54f13e1d..380f015f 100644
--- a/source/paths/TestComponentOfferingAssociationAttemptOnAssociationInstance.yaml
+++ b/source/paths/TestComponentOfferingAssociationAttemptOnAssociationInstance.yaml
@@ -26,7 +26,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/TestComponentOfferingAssociationAttempt.yaml'
 
diff --git a/source/paths/TestComponentOfferingAssociationCollection.yaml b/source/paths/TestComponentOfferingAssociationCollection.yaml
index 26a77f36..d6b5b93a 100644
--- a/source/paths/TestComponentOfferingAssociationCollection.yaml
+++ b/source/paths/TestComponentOfferingAssociationCollection.yaml
@@ -39,7 +39,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/TestComponentOfferingAssociationInstance.yaml b/source/paths/TestComponentOfferingAssociationInstance.yaml
index 78fe1740..7df63238 100644
--- a/source/paths/TestComponentOfferingAssociationInstance.yaml
+++ b/source/paths/TestComponentOfferingAssociationInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/TestComponentOfferingAssociation.yaml'          
     '400':
@@ -70,7 +70,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/TestComponentOfferingAssociation.yaml'
         examples:
@@ -199,7 +199,7 @@ patch:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/AssociationId.yaml'
diff --git a/source/paths/TestComponentOfferingAssociationUrl.yaml b/source/paths/TestComponentOfferingAssociationUrl.yaml
index 08a0d8b4..60c60410 100644
--- a/source/paths/TestComponentOfferingAssociationUrl.yaml
+++ b/source/paths/TestComponentOfferingAssociationUrl.yaml
@@ -17,7 +17,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/Url.yaml'          
     '400':
diff --git a/source/paths/TestComponentOfferingCollection.yaml b/source/paths/TestComponentOfferingCollection.yaml
index 29007654..928c6a91 100644
--- a/source/paths/TestComponentOfferingCollection.yaml
+++ b/source/paths/TestComponentOfferingCollection.yaml
@@ -44,7 +44,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/TestComponentOfferingGroupCollection.yaml b/source/paths/TestComponentOfferingGroupCollection.yaml
index 9a281d2f..bb0c8f2b 100644
--- a/source/paths/TestComponentOfferingGroupCollection.yaml
+++ b/source/paths/TestComponentOfferingGroupCollection.yaml
@@ -28,7 +28,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             allOf:
               - $ref: '../schemas/Pagination.yaml'
diff --git a/source/paths/TestComponentOfferingInstance.yaml b/source/paths/TestComponentOfferingInstance.yaml
index 35bcc213..d7f1b150 100644
--- a/source/paths/TestComponentOfferingInstance.yaml
+++ b/source/paths/TestComponentOfferingInstance.yaml
@@ -32,7 +32,7 @@ get:
     '200':
       description: OK
       content:
-        application/json:
+        application/vnd.oeapi+json:
           schema:
             $ref: '../schemas/TestComponentOffering.yaml'
     '400':
@@ -70,7 +70,7 @@ put:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/TestComponentOffering.yaml'
 
@@ -119,7 +119,7 @@ patch:
   requestBody:
     required: true
     content:
-      application/json:
+      application/vnd.oeapi+json:
         schema:
           $ref: '../schemas/TestComponentOffering.yaml'