diff --git a/angular/generateApi.sh b/angular/generateApi.sh
index 1778373..c994ec6 100644
--- a/angular/generateApi.sh
+++ b/angular/generateApi.sh
@@ -12,6 +12,13 @@ find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydralast/'hydra:
 find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydranext/'hydra:next'/g" {} +
 find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydraprevious/'hydra:previous'/g" {} +
 
+# Entferne "context?: ..."
+find ./src/app/core/api/v1/model -type f -name '*.ts' -exec sed -i '' '/context\?: .*;/d' {} +
+
+# Ersetze in jeder Datei nur das erste Vorkommen von "readonly type?: string;"
+# durch "readonly xType?: string;"
+find ./src/app/core/api/v1/model -type f -name '*.ts' -exec perl -i -pe 'if($.==1){$x=0} if(!$x && /^(\s*)readonly type\?: string;/){ $x=1; s//$1readonly xType?: string;/ }' {} \;
+
 
 # https://dev.to/martinmcwhorter/generate-angular-reactiveforms-from-swagger-openapi-35h9 -> alternative
 # https://github.com/Humbertda/ngx-openapi-form-generator -> alternative
diff --git a/angular/src/app/core/api/v1/model/constraintViolationJson.ts b/angular/src/app/core/api/v1/model/constraintViolationJson.ts
index d2e9691..85b8d13 100644
--- a/angular/src/app/core/api/v1/model/constraintViolationJson.ts
+++ b/angular/src/app/core/api/v1/model/constraintViolationJson.ts
@@ -19,7 +19,7 @@ export interface ConstraintViolationJson {
     status?: number;
     violations?: Array<ConstraintViolationJsonViolationsInner>;
     readonly detail?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly title?: string | null;
     readonly instance?: string | null;
 }
diff --git a/angular/src/app/core/api/v1/model/constraintViolationJsonldJsonld.ts b/angular/src/app/core/api/v1/model/constraintViolationJsonldJsonld.ts
index 5ea0eb3..a61f826 100644
--- a/angular/src/app/core/api/v1/model/constraintViolationJsonldJsonld.ts
+++ b/angular/src/app/core/api/v1/model/constraintViolationJsonldJsonld.ts
@@ -17,8 +17,8 @@ import { ConstraintViolationJsonViolationsInner } from './constraintViolationJso
  * Unprocessable entity
  */
 export interface ConstraintViolationJsonldJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
+    readonly xType?: string;
     status?: number;
     violations?: Array<ConstraintViolationJsonViolationsInner>;
     readonly detail?: string;
diff --git a/angular/src/app/core/api/v1/model/errorJsonld.ts b/angular/src/app/core/api/v1/model/errorJsonld.ts
index db06279..35527d4 100644
--- a/angular/src/app/core/api/v1/model/errorJsonld.ts
+++ b/angular/src/app/core/api/v1/model/errorJsonld.ts
@@ -16,8 +16,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * A representation of common errors.
  */
 export interface ErrorJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
+    readonly xType?: string;
     /**
      * A short, human-readable summary of the problem.
      */
diff --git a/angular/src/app/core/api/v1/model/eventJsonld.ts b/angular/src/app/core/api/v1/model/eventJsonld.ts
index 232b309..ca4f131 100644
--- a/angular/src/app/core/api/v1/model/eventJsonld.ts
+++ b/angular/src/app/core/api/v1/model/eventJsonld.ts
@@ -16,9 +16,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface EventJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     name?: string;
     identifier?: string;
diff --git a/angular/src/app/core/api/v1/model/locationJsonld.ts b/angular/src/app/core/api/v1/model/locationJsonld.ts
index c35d78f..8ed34dd 100644
--- a/angular/src/app/core/api/v1/model/locationJsonld.ts
+++ b/angular/src/app/core/api/v1/model/locationJsonld.ts
@@ -17,9 +17,8 @@ import { ZoneJsonld } from './zoneJsonld';
  * 
  */
 export interface LocationJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     readonly zone?: ZoneJsonld;
     zoneIri: string | null;
diff --git a/angular/src/app/core/api/v1/model/mediaObjectJsonld.ts b/angular/src/app/core/api/v1/model/mediaObjectJsonld.ts
index 78cedc4..625204f 100644
--- a/angular/src/app/core/api/v1/model/mediaObjectJsonld.ts
+++ b/angular/src/app/core/api/v1/model/mediaObjectJsonld.ts
@@ -16,9 +16,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface MediaObjectJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     contentUrl?: string | null;
     readonly filePath?: string | null;
diff --git a/angular/src/app/core/api/v1/model/modelError.ts b/angular/src/app/core/api/v1/model/modelError.ts
index eca89be..0263278 100644
--- a/angular/src/app/core/api/v1/model/modelError.ts
+++ b/angular/src/app/core/api/v1/model/modelError.ts
@@ -31,6 +31,6 @@ export interface ModelError {
     /**
      * A URI reference that identifies the problem type
      */
-    readonly type?: string;
+    readonly xType?: string;
 }
 
diff --git a/angular/src/app/core/api/v1/model/shippingCompanyJsonld.ts b/angular/src/app/core/api/v1/model/shippingCompanyJsonld.ts
index 3e6cd64..3360b66 100644
--- a/angular/src/app/core/api/v1/model/shippingCompanyJsonld.ts
+++ b/angular/src/app/core/api/v1/model/shippingCompanyJsonld.ts
@@ -16,9 +16,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface ShippingCompanyJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     name: string;
     code: string;
diff --git a/angular/src/app/core/api/v1/model/tripJsonld.ts b/angular/src/app/core/api/v1/model/tripJsonld.ts
index 7c823af..43c32e4 100644
--- a/angular/src/app/core/api/v1/model/tripJsonld.ts
+++ b/angular/src/app/core/api/v1/model/tripJsonld.ts
@@ -18,9 +18,8 @@ import { LocationJsonld } from './locationJsonld';
  * 
  */
 export interface TripJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     readonly vessel?: VesselJsonld;
     vesselIri: string | null;
diff --git a/angular/src/app/core/api/v1/model/tripLocationJsonld.ts b/angular/src/app/core/api/v1/model/tripLocationJsonld.ts
index 951f4da..e7c7181 100644
--- a/angular/src/app/core/api/v1/model/tripLocationJsonld.ts
+++ b/angular/src/app/core/api/v1/model/tripLocationJsonld.ts
@@ -18,9 +18,8 @@ import { LocationJsonld } from './locationJsonld';
  * 
  */
 export interface TripLocationJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     trip?: TripJsonld;
     tripIri: string | null;
diff --git a/angular/src/app/core/api/v1/model/userJsonld.ts b/angular/src/app/core/api/v1/model/userJsonld.ts
index 3e772ef..ef8781e 100644
--- a/angular/src/app/core/api/v1/model/userJsonld.ts
+++ b/angular/src/app/core/api/v1/model/userJsonld.ts
@@ -17,9 +17,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface UserJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     email: string;
     firstName: string;
diff --git a/angular/src/app/core/api/v1/model/userTripEventJsonld.ts b/angular/src/app/core/api/v1/model/userTripEventJsonld.ts
index 74d18a9..7707308 100644
--- a/angular/src/app/core/api/v1/model/userTripEventJsonld.ts
+++ b/angular/src/app/core/api/v1/model/userTripEventJsonld.ts
@@ -20,9 +20,8 @@ import { LocationJsonld } from './locationJsonld';
  * 
  */
 export interface UserTripEventJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     readonly userTrip?: UserTripJsonld;
     userTripIri: string | null;
diff --git a/angular/src/app/core/api/v1/model/userTripJsonld.ts b/angular/src/app/core/api/v1/model/userTripJsonld.ts
index 1c4169d..7a5ca11 100644
--- a/angular/src/app/core/api/v1/model/userTripJsonld.ts
+++ b/angular/src/app/core/api/v1/model/userTripJsonld.ts
@@ -19,9 +19,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface UserTripJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     readonly trip?: TripJsonld;
     tripIri: string | null;
diff --git a/angular/src/app/core/api/v1/model/vesselJsonld.ts b/angular/src/app/core/api/v1/model/vesselJsonld.ts
index 0fb3708..a99c580 100644
--- a/angular/src/app/core/api/v1/model/vesselJsonld.ts
+++ b/angular/src/app/core/api/v1/model/vesselJsonld.ts
@@ -17,9 +17,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface VesselJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     name: string;
     code: string;
diff --git a/angular/src/app/core/api/v1/model/zoneJsonld.ts b/angular/src/app/core/api/v1/model/zoneJsonld.ts
index 808399e..7e6951d 100644
--- a/angular/src/app/core/api/v1/model/zoneJsonld.ts
+++ b/angular/src/app/core/api/v1/model/zoneJsonld.ts
@@ -16,9 +16,8 @@ import { ConstraintViolationJsonldJsonldContext } from './constraintViolationJso
  * 
  */
 export interface ZoneJsonld { 
-    context?: ConstraintViolationJsonldJsonldContext;
     readonly id?: string;
-    readonly type?: string;
+    readonly xType?: string;
     readonly dbId?: number | null;
     name: string;
     readonly createdAt?: string | null;
diff --git a/httpdocs/src/ApiResource/UserTripEventApi.php b/httpdocs/src/ApiResource/UserTripEventApi.php
index 0af4ffa..218554b 100644
--- a/httpdocs/src/ApiResource/UserTripEventApi.php
+++ b/httpdocs/src/ApiResource/UserTripEventApi.php
@@ -140,7 +140,7 @@ class UserTripEventApi
     #[Assert\NotBlank]
     public \DateTimeImmutable $date;
 
-    public ?string $note;
+    public ?string $note = null;
 
     #[ApiProperty(writable: false)]
     public ?\DateTimeImmutable $createdAt = null;