diff --git a/README.md b/README.md
index 434b616c5..4e0696dbc 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,4 @@ Developed, maintained and sponsored by:
 
 See the [Dynamo Framework website](https://www.dynamoframework.org) for more information.
 
-_Copyright © 2014 - 2024 Open Circle Solutions BV._
+_Copyright © 2014 - 2024 Open Circle Solutions._
diff --git a/dynamo-angular/dynamo/model/api.module.ts b/dynamo-angular/dynamo/model/api.module.ts
index f69ffd9db..16ba03c3e 100644
--- a/dynamo-angular/dynamo/model/api.module.ts
+++ b/dynamo-angular/dynamo/model/api.module.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/api/api.ts b/dynamo-angular/dynamo/model/api/api.ts
index f1cfab729..9934e6423 100644
--- a/dynamo-angular/dynamo/model/api/api.ts
+++ b/dynamo-angular/dynamo/model/api/api.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/api/autoFill.service.ts b/dynamo-angular/dynamo/model/api/autoFill.service.ts
index f0f02b7fc..0a410ffff 100644
--- a/dynamo-angular/dynamo/model/api/autoFill.service.ts
+++ b/dynamo-angular/dynamo/model/api/autoFill.service.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
         }       from '@angular/common/http';
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
@@ -113,7 +113,7 @@ export class AutoFillService {
     /**
      * Makes a request to automatically fill a form
      * @param entityName The name of the entity for which to fill a form
-     * @param autoFillRequest 
+     * @param autoFillRequest
      * @param reference The entity model reference
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/dynamo-angular/dynamo/model/api/cRUD.service.ts b/dynamo-angular/dynamo/model/api/cRUD.service.ts
index 03c95fe29..1b9549606 100644
--- a/dynamo-angular/dynamo/model/api/cRUD.service.ts
+++ b/dynamo-angular/dynamo/model/api/cRUD.service.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
         }       from '@angular/common/http';
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
@@ -187,7 +187,7 @@ export class CRUDService {
      * Executes an action defined in the entity model
      * @param entityName The name of the entity
      * @param actionId The id of the action to execute
-     * @param body 
+     * @param body
      * @param reference Entity model reference
      * @param id ID of the entity to update (in case of update actions)
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
@@ -502,8 +502,8 @@ export class CRUDService {
     /**
      * Create a new entity
      * @param entityName The name of the entity
-     * @param body 
-     * @param reference 
+     * @param body
+     * @param reference
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
@@ -590,7 +590,7 @@ export class CRUDService {
      * Updates an existing entity
      * @param entityName The name of the entity
      * @param id The ID of the entity
-     * @param body 
+     * @param body
      * @param reference Reference to specify the entity model to use
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
@@ -680,7 +680,7 @@ export class CRUDService {
     /**
      * Executes a search request
      * @param entityName The name of the entity
-     * @param searchModel 
+     * @param searchModel
      * @param reference The entity model reference
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/dynamo-angular/dynamo/model/api/export.service.ts b/dynamo-angular/dynamo/model/api/export.service.ts
index 907371ab3..45de3eb7c 100644
--- a/dynamo-angular/dynamo/model/api/export.service.ts
+++ b/dynamo-angular/dynamo/model/api/export.service.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
         }       from '@angular/common/http';
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
@@ -114,7 +114,7 @@ export class ExportService {
      * Exports data to csv
      * @param entityName The name of the entity to export
      * @param exportMode The export mode
-     * @param searchModel 
+     * @param searchModel
      * @param reference The entity model reference
      * @param locale The locale to use
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
@@ -204,7 +204,7 @@ export class ExportService {
      * Exports data to Excel
      * @param entityName The name of the entity to export
      * @param exportMode The export mode
-     * @param searchModel 
+     * @param searchModel
      * @param reference The entity model reference
      * @param locale The locale to use
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
diff --git a/dynamo-angular/dynamo/model/api/file.service.ts b/dynamo-angular/dynamo/model/api/file.service.ts
index 64a515f77..6e15d1c40 100644
--- a/dynamo-angular/dynamo/model/api/file.service.ts
+++ b/dynamo-angular/dynamo/model/api/file.service.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
         }       from '@angular/common/http';
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
@@ -377,7 +377,7 @@ export class FileService {
      * Uploads a file
      * @param entityId The ID of the entity on which to store the file
      * @param entityName The name of the entity
-     * @param attributeName 
+     * @param attributeName
      * @param file The file to upload
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
diff --git a/dynamo-angular/dynamo/model/api/model.service.ts b/dynamo-angular/dynamo/model/api/model.service.ts
index 1f2c8b7fa..651bedb81 100644
--- a/dynamo-angular/dynamo/model/api/model.service.ts
+++ b/dynamo-angular/dynamo/model/api/model.service.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
         }       from '@angular/common/http';
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
@@ -114,7 +114,7 @@ export class ModelService {
      * Retrieve an action entity model
      * @param entityName The name of the entity
      * @param actionId The ID of the action
-     * @param reference 
+     * @param reference
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
diff --git a/dynamo-angular/dynamo/model/api/status.service.ts b/dynamo-angular/dynamo/model/api/status.service.ts
index 72f16f937..41c839d83 100644
--- a/dynamo-angular/dynamo/model/api/status.service.ts
+++ b/dynamo-angular/dynamo/model/api/status.service.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
         }       from '@angular/common/http';
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
diff --git a/dynamo-angular/dynamo/model/configuration.ts b/dynamo-angular/dynamo/model/configuration.ts
index d22613894..20aa9e89b 100644
--- a/dynamo-angular/dynamo/model/configuration.ts
+++ b/dynamo-angular/dynamo/model/configuration.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/encoder.ts b/dynamo-angular/dynamo/model/encoder.ts
index 1e3a89ca0..aade72822 100644
--- a/dynamo-angular/dynamo/model/encoder.ts
+++ b/dynamo-angular/dynamo/model/encoder.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/git_push.sh b/dynamo-angular/dynamo/model/git_push.sh
index 4b4a45b92..f6fd81ced 100644
--- a/dynamo-angular/dynamo/model/git_push.sh
+++ b/dynamo-angular/dynamo/model/git_push.sh
@@ -4,14 +4,14 @@
 # #%L
 # Dynamo Framework
 # %%
-# Copyright (C) 2014 - 2024 Open Circle Solutions BV
+# Copyright (C) 2014 - 2024 Open Circle Solutions
 # %%
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/index.ts b/dynamo-angular/dynamo/model/index.ts
index a713f22b3..5ede040d7 100644
--- a/dynamo-angular/dynamo/model/index.ts
+++ b/dynamo-angular/dynamo/model/index.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/model/abstractEntity.ts b/dynamo-angular/dynamo/model/model/abstractEntity.ts
index 485d3d244..69c318dd0 100644
--- a/dynamo-angular/dynamo/model/model/abstractEntity.ts
+++ b/dynamo-angular/dynamo/model/model/abstractEntity.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface AbstractEntity { 
+export interface AbstractEntity {
     id?: object;
 }
 
diff --git a/dynamo-angular/dynamo/model/model/attributeGroupResponse.ts b/dynamo-angular/dynamo/model/model/attributeGroupResponse.ts
index 947546418..8a3978369 100644
--- a/dynamo-angular/dynamo/model/model/attributeGroupResponse.ts
+++ b/dynamo-angular/dynamo/model/model/attributeGroupResponse.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface AttributeGroupResponse { 
+export interface AttributeGroupResponse {
     index: number;
     groupName: string;
     groupDescriptions: { [key: string]: string; };
diff --git a/dynamo-angular/dynamo/model/model/attributeModelResponse.ts b/dynamo-angular/dynamo/model/model/attributeModelResponse.ts
index 426e69399..3af133d0f 100644
--- a/dynamo-angular/dynamo/model/model/attributeModelResponse.ts
+++ b/dynamo-angular/dynamo/model/model/attributeModelResponse.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { CascadeModel } from './cascadeModel';
 
 
-export interface AttributeModelResponse { 
+export interface AttributeModelResponse {
     allowedExtensions?: Set<string>;
     currencyCode?: string;
     dateType?: AttributeModelResponse.DateTypeEnum;
diff --git a/dynamo-angular/dynamo/model/model/autoFillOptions.ts b/dynamo-angular/dynamo/model/model/autoFillOptions.ts
index 1a2601db2..63607ce9c 100644
--- a/dynamo-angular/dynamo/model/model/autoFillOptions.ts
+++ b/dynamo-angular/dynamo/model/model/autoFillOptions.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface AutoFillOptions { 
+export interface AutoFillOptions {
     type?: AutoFillOptions.TypeEnum;
     description?: string;
     defaultValue?: boolean;
diff --git a/dynamo-angular/dynamo/model/model/autoFillRequest.ts b/dynamo-angular/dynamo/model/model/autoFillRequest.ts
index 17a1d5626..219e02024 100644
--- a/dynamo-angular/dynamo/model/model/autoFillRequest.ts
+++ b/dynamo-angular/dynamo/model/model/autoFillRequest.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -33,7 +33,7 @@
 /**
  * Therequest containing the input and desired AI service
  */
-export interface AutoFillRequest { 
+export interface AutoFillRequest {
     input: string;
     type: AutoFillRequest.TypeEnum;
     additionalInstructions?: string;
diff --git a/dynamo-angular/dynamo/model/model/cascadeModel.ts b/dynamo-angular/dynamo/model/model/cascadeModel.ts
index 7210d60df..d19972de3 100644
--- a/dynamo-angular/dynamo/model/model/cascadeModel.ts
+++ b/dynamo-angular/dynamo/model/model/cascadeModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface CascadeModel { 
+export interface CascadeModel {
     cascadeTo: string;
     filterPath: string;
     cascadeMode: CascadeModel.CascadeModeEnum;
diff --git a/dynamo-angular/dynamo/model/model/dateRangeFilterModel.ts b/dynamo-angular/dynamo/model/model/dateRangeFilterModel.ts
index 534ecc476..122f484a5 100644
--- a/dynamo-angular/dynamo/model/model/dateRangeFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/dateRangeFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface DateRangeFilterModel extends FilterModel { 
+export interface DateRangeFilterModel extends FilterModel {
     from?: string;
     to?: string;
 }
diff --git a/dynamo-angular/dynamo/model/model/elementCollectionFilterModel.ts b/dynamo-angular/dynamo/model/model/elementCollectionFilterModel.ts
index 9671811d1..e5c9920ae 100644
--- a/dynamo-angular/dynamo/model/model/elementCollectionFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/elementCollectionFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface ElementCollectionFilterModel extends FilterModel { 
+export interface ElementCollectionFilterModel extends FilterModel {
     values?: Array<object>;
 }
 export namespace ElementCollectionFilterModel {
diff --git a/dynamo-angular/dynamo/model/model/entityModelActionResponse.ts b/dynamo-angular/dynamo/model/model/entityModelActionResponse.ts
index 313d71641..a8d538c3d 100644
--- a/dynamo-angular/dynamo/model/model/entityModelActionResponse.ts
+++ b/dynamo-angular/dynamo/model/model/entityModelActionResponse.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { AttributeModelResponse } from './attributeModelResponse';
 
 
-export interface EntityModelActionResponse { 
+export interface EntityModelActionResponse {
     id: string;
     displayNames: { [key: string]: string; };
     attributeModels: Array<AttributeModelResponse>;
diff --git a/dynamo-angular/dynamo/model/model/entityModelResponse.ts b/dynamo-angular/dynamo/model/model/entityModelResponse.ts
index a19833531..2959a0c31 100644
--- a/dynamo-angular/dynamo/model/model/entityModelResponse.ts
+++ b/dynamo-angular/dynamo/model/model/entityModelResponse.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -33,7 +33,7 @@ import { AttributeGroupResponse } from './attributeGroupResponse';
 import { EntityModelActionResponse } from './entityModelActionResponse';
 
 
-export interface EntityModelResponse { 
+export interface EntityModelResponse {
     attributeModels: Array<AttributeModelResponse>;
     attributeGroups: Array<AttributeGroupResponse>;
     attributeNamesOrdered: Array<string>;
diff --git a/dynamo-angular/dynamo/model/model/equalsFilterModel.ts b/dynamo-angular/dynamo/model/model/equalsFilterModel.ts
index 06d292043..639c697e6 100644
--- a/dynamo-angular/dynamo/model/model/equalsFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/equalsFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface EqualsFilterModel extends FilterModel { 
+export interface EqualsFilterModel extends FilterModel {
     value: object;
 }
 export namespace EqualsFilterModel {
diff --git a/dynamo-angular/dynamo/model/model/filterModel.ts b/dynamo-angular/dynamo/model/model/filterModel.ts
index 9ee268e6a..5642a7b07 100644
--- a/dynamo-angular/dynamo/model/model/filterModel.ts
+++ b/dynamo-angular/dynamo/model/model/filterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface FilterModel { 
+export interface FilterModel {
     match: FilterModel.MatchEnum;
     name?: string;
 }
diff --git a/dynamo-angular/dynamo/model/model/instantRangeFilterModel.ts b/dynamo-angular/dynamo/model/model/instantRangeFilterModel.ts
index 8487872ef..5004ea629 100644
--- a/dynamo-angular/dynamo/model/model/instantRangeFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/instantRangeFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface InstantRangeFilterModel extends FilterModel { 
+export interface InstantRangeFilterModel extends FilterModel {
     from?: string;
     to?: string;
 }
diff --git a/dynamo-angular/dynamo/model/model/localDateTimeRangeFilterModel.ts b/dynamo-angular/dynamo/model/model/localDateTimeRangeFilterModel.ts
index 90e61c4d1..d914dc61c 100644
--- a/dynamo-angular/dynamo/model/model/localDateTimeRangeFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/localDateTimeRangeFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface LocalDateTimeRangeFilterModel extends FilterModel { 
+export interface LocalDateTimeRangeFilterModel extends FilterModel {
     from?: string;
     to?: string;
 }
diff --git a/dynamo-angular/dynamo/model/model/localTime.ts b/dynamo-angular/dynamo/model/model/localTime.ts
index 60343e52f..2ab0a6bac 100644
--- a/dynamo-angular/dynamo/model/model/localTime.ts
+++ b/dynamo-angular/dynamo/model/model/localTime.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface LocalTime { 
+export interface LocalTime {
     hour?: number;
     minute?: number;
     second?: number;
diff --git a/dynamo-angular/dynamo/model/model/models.ts b/dynamo-angular/dynamo/model/model/models.ts
index 5b7ba7eb8..1010de269 100644
--- a/dynamo-angular/dynamo/model/model/models.ts
+++ b/dynamo-angular/dynamo/model/model/models.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/model/notFilterModel.ts b/dynamo-angular/dynamo/model/model/notFilterModel.ts
index 04440e1e8..ec749760f 100644
--- a/dynamo-angular/dynamo/model/model/notFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/notFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface NotFilterModel extends FilterModel { 
+export interface NotFilterModel extends FilterModel {
     filter: FilterModel;
 }
 export namespace NotFilterModel {
diff --git a/dynamo-angular/dynamo/model/model/numberInFilterModel.ts b/dynamo-angular/dynamo/model/model/numberInFilterModel.ts
index ee902adcb..571e73aba 100644
--- a/dynamo-angular/dynamo/model/model/numberInFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/numberInFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface NumberInFilterModel extends FilterModel { 
+export interface NumberInFilterModel extends FilterModel {
     values: Array<number>;
 }
 export namespace NumberInFilterModel {
diff --git a/dynamo-angular/dynamo/model/model/numberRangeFilterModel.ts b/dynamo-angular/dynamo/model/model/numberRangeFilterModel.ts
index d1533823b..1c7076525 100644
--- a/dynamo-angular/dynamo/model/model/numberRangeFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/numberRangeFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface NumberRangeFilterModel extends FilterModel { 
+export interface NumberRangeFilterModel extends FilterModel {
     from?: number;
     to?: number;
 }
diff --git a/dynamo-angular/dynamo/model/model/orFilterModel.ts b/dynamo-angular/dynamo/model/model/orFilterModel.ts
index c394af542..4ae75ab96 100644
--- a/dynamo-angular/dynamo/model/model/orFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/orFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -31,7 +31,7 @@
 import { FilterModel } from './filterModel';
 
 
-export interface OrFilterModel extends FilterModel { 
+export interface OrFilterModel extends FilterModel {
     orFilters?: Array<FilterModel>;
 }
 export namespace OrFilterModel {
diff --git a/dynamo-angular/dynamo/model/model/pagingModel.ts b/dynamo-angular/dynamo/model/model/pagingModel.ts
index 3cf7fdbea..4e38ef345 100644
--- a/dynamo-angular/dynamo/model/model/pagingModel.ts
+++ b/dynamo-angular/dynamo/model/model/pagingModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface PagingModel { 
+export interface PagingModel {
     pageNumber: number;
     pageSize: number;
     type: PagingModel.TypeEnum;
diff --git a/dynamo-angular/dynamo/model/model/searchModel.ts b/dynamo-angular/dynamo/model/model/searchModel.ts
index 7d37eadaa..0e801633e 100644
--- a/dynamo-angular/dynamo/model/model/searchModel.ts
+++ b/dynamo-angular/dynamo/model/model/searchModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -36,7 +36,7 @@ import { PagingModel } from './pagingModel';
 /**
  * The search request
  */
-export interface SearchModel { 
+export interface SearchModel {
     paging: PagingModel;
     sort: SortModel;
     filters?: Array<SearchModelFiltersInner>;
diff --git a/dynamo-angular/dynamo/model/model/searchModelFiltersInner.ts b/dynamo-angular/dynamo/model/model/searchModelFiltersInner.ts
index f963400a3..60614eba7 100644
--- a/dynamo-angular/dynamo/model/model/searchModelFiltersInner.ts
+++ b/dynamo-angular/dynamo/model/model/searchModelFiltersInner.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
diff --git a/dynamo-angular/dynamo/model/model/searchResultsModelAbstractEntity.ts b/dynamo-angular/dynamo/model/model/searchResultsModelAbstractEntity.ts
index 079f704a7..1a00f7192 100644
--- a/dynamo-angular/dynamo/model/model/searchResultsModelAbstractEntity.ts
+++ b/dynamo-angular/dynamo/model/model/searchResultsModelAbstractEntity.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@ import { AbstractEntity } from './abstractEntity';
 import { StatsModel } from './statsModel';
 
 
-export interface SearchResultsModelAbstractEntity { 
+export interface SearchResultsModelAbstractEntity {
     stats?: StatsModel;
     results?: Array<AbstractEntity>;
 }
diff --git a/dynamo-angular/dynamo/model/model/sortModel.ts b/dynamo-angular/dynamo/model/model/sortModel.ts
index 164309484..9809ae51c 100644
--- a/dynamo-angular/dynamo/model/model/sortModel.ts
+++ b/dynamo-angular/dynamo/model/model/sortModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface SortModel { 
+export interface SortModel {
     sortDirection: SortModel.SortDirectionEnum;
     sortField: string;
 }
diff --git a/dynamo-angular/dynamo/model/model/statsModel.ts b/dynamo-angular/dynamo/model/model/statsModel.ts
index 93afb9f87..5995b7d8e 100644
--- a/dynamo-angular/dynamo/model/model/statsModel.ts
+++ b/dynamo-angular/dynamo/model/model/statsModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface StatsModel { 
+export interface StatsModel {
     pageNumber?: number;
     pageSize?: number;
     totalResults?: number;
diff --git a/dynamo-angular/dynamo/model/model/statusResponse.ts b/dynamo-angular/dynamo/model/model/statusResponse.ts
index af63c39f7..73d48633a 100644
--- a/dynamo-angular/dynamo/model/model/statusResponse.ts
+++ b/dynamo-angular/dynamo/model/model/statusResponse.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -30,7 +30,7 @@
  */
 
 
-export interface StatusResponse { 
+export interface StatusResponse {
     status?: string;
 }
 
diff --git a/dynamo-angular/dynamo/model/model/timeRangeFilterModel.ts b/dynamo-angular/dynamo/model/model/timeRangeFilterModel.ts
index 1bd6a2b30..e6db6308d 100644
--- a/dynamo-angular/dynamo/model/model/timeRangeFilterModel.ts
+++ b/dynamo-angular/dynamo/model/model/timeRangeFilterModel.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
  */
 /**
  * GTS
- * Gift tracking 
+ * Gift tracking
  *
  * The version of the OpenAPI document: 1
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
@@ -32,7 +32,7 @@ import { LocalTime } from './localTime';
 import { FilterModel } from './filterModel';
 
 
-export interface TimeRangeFilterModel extends FilterModel { 
+export interface TimeRangeFilterModel extends FilterModel {
     from?: LocalTime;
     to?: LocalTime;
 }
diff --git a/dynamo-angular/dynamo/model/param.ts b/dynamo-angular/dynamo/model/param.ts
index f4b8a7932..ce11f52d2 100644
--- a/dynamo-angular/dynamo/model/param.ts
+++ b/dynamo-angular/dynamo/model/param.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/dynamo/model/variables.ts b/dynamo-angular/dynamo/model/variables.ts
index 5e1620dd3..b4806e269 100644
--- a/dynamo-angular/dynamo/model/variables.ts
+++ b/dynamo-angular/dynamo/model/variables.ts
@@ -2,14 +2,14 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.html b/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.html
index ea4f4e8d8..a10d6732e 100644
--- a/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.html
+++ b/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.ts b/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.ts
index ff5ffbd79..2b1e4f013 100644
--- a/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.ts
+++ b/dynamo-angular/shared/components/auto-fill-dialog/auto-fill-dialog.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.html b/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.html
index 801c27e5d..a37fd79b6 100644
--- a/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.html
+++ b/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.ts b/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.ts
index 3f8cacd53..76d6189f3 100644
--- a/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.ts
+++ b/dynamo-angular/shared/components/backend-not-available/backend-not-available.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/base-component.ts b/dynamo-angular/shared/components/base-component.ts
index da5757ad4..2c2e0c8cf 100644
--- a/dynamo-angular/shared/components/base-component.ts
+++ b/dynamo-angular/shared/components/base-component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/base-composite-collection-component.ts b/dynamo-angular/shared/components/base-composite-collection-component.ts
index c29af77e1..f2c41d509 100644
--- a/dynamo-angular/shared/components/base-composite-collection-component.ts
+++ b/dynamo-angular/shared/components/base-composite-collection-component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,6 +64,11 @@ export abstract class BaseCompositeCollectionComponent extends BaseCompositeComp
   @Input() exportModeReference: string = '';
   // service for managing hidden fields
   @Input() hiddenFieldService?: HiddenFieldService;
+  // callback method to disable/enable model actions based on form state
+  @Input() modelActionEnabled?: (
+    action: EntityModelActionResponse,
+    editObject: any
+  ) => boolean;
 
   // overridden input components
   @ContentChildren(OverrideFieldDirective, { descendants: true })
@@ -119,6 +124,10 @@ export abstract class BaseCompositeCollectionComponent extends BaseCompositeComp
       });
   }
 
+  /**
+   * Filters the entity model actions, returning those that have CREATE mode
+   * @returns the filtered list of actions
+   */
   filterEntityModelActions() {
     return this.entityModel?.actions
       ?.filter(
@@ -127,5 +136,18 @@ export abstract class BaseCompositeCollectionComponent extends BaseCompositeComp
       .filter((action) => this.isActionAllowed(action));
   }
 
+  /**
+   * Checks whether an entity model action is enabled
+   * @param row the row to check
+   * @param action the action
+   * @returns true when the action is enabled, false otherwise
+   */
+  isModelActionEnabled(row: any, action: EntityModelActionResponse): boolean {
+    if (!this.modelActionEnabled) {
+      return true;
+    }
+    return this.modelActionEnabled(action, row);
+  }
+
   afterActionDialogClosed() {}
 }
diff --git a/dynamo-angular/shared/components/base-composite.component.ts b/dynamo-angular/shared/components/base-composite.component.ts
index 6a22462ab..6e93d41b1 100644
--- a/dynamo-angular/shared/components/base-composite.component.ts
+++ b/dynamo-angular/shared/components/base-composite.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -84,14 +84,12 @@ export abstract class BaseCompositeComponent {
   @Input() public locale: string = getLocale();
   // default filters to apply when searching
   @Input() defaultFilters: FilterModel[] = [];
-
   // filters to apply to individual fields
   @Input() fieldFilters: Map<string, FilterModel[]> = new Map<
     string,
     FilterModel[]
   >();
-
-  // filters to apply to individual fields
+  // cascading filters to apply to individual fields
   @Input() cascadeFilters: Map<string, FilterModel[]> = new Map<
     string,
     FilterModel[]
diff --git a/dynamo-angular/shared/components/base-entity/base-entity.component.html b/dynamo-angular/shared/components/base-entity/base-entity.component.html
index da054f884..ba000b609 100644
--- a/dynamo-angular/shared/components/base-entity/base-entity.component.html
+++ b/dynamo-angular/shared/components/base-entity/base-entity.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/base-entity/base-entity.component.ts b/dynamo-angular/shared/components/base-entity/base-entity.component.ts
index 463e22161..3c339d2c7 100644
--- a/dynamo-angular/shared/components/base-entity/base-entity.component.ts
+++ b/dynamo-angular/shared/components/base-entity/base-entity.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/base-search-form.ts b/dynamo-angular/shared/components/base-search-form.ts
index 3e92a3e45..96825b9bb 100644
--- a/dynamo-angular/shared/components/base-search-form.ts
+++ b/dynamo-angular/shared/components/base-search-form.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/boolean-field/boolean-field.component.html b/dynamo-angular/shared/components/boolean-field/boolean-field.component.html
index 0115675a4..45728dc0f 100644
--- a/dynamo-angular/shared/components/boolean-field/boolean-field.component.html
+++ b/dynamo-angular/shared/components/boolean-field/boolean-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/boolean-field/boolean-field.component.ts b/dynamo-angular/shared/components/boolean-field/boolean-field.component.ts
index be404ab2f..fda503ad3 100644
--- a/dynamo-angular/shared/components/boolean-field/boolean-field.component.ts
+++ b/dynamo-angular/shared/components/boolean-field/boolean-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/data-table/data-table.component.html b/dynamo-angular/shared/components/data-table/data-table.component.html
index 1acae81de..2331dc528 100644
--- a/dynamo-angular/shared/components/data-table/data-table.component.html
+++ b/dynamo-angular/shared/components/data-table/data-table.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -78,25 +78,25 @@
     </tr>
   </ng-template>
   <ng-template pTemplate="body" let-row>
-    <tr [ngClass]="getRowClass(row)" [pContextMenuRow]="row" >
+    <tr [ngClass]="getRowClass(row)" [pContextMenuRow]="row">
       <td *ngFor="let col of selectedColumns" (click)="onRowSelect(row)">
         <!-- date columns -->
         <ng-container *ngIf="!col.text && col.datePipe">
           {{
-            adjustTimestamp(row[col.field], col.datePipe.instant)
+            adjustTimestamp(getNestedValue(row,col.field), col.datePipe.instant)
               | date : col.datePipe.formats![locale]
           }}
         </ng-container>
         <ng-container *ngIf="!col.text && col.numberFormat">
           {{
-            row[col.field]
+            getNestedValue(row,col.field)
               | number : col.numberFormat.digitsInfo : col.numberFormat.locale
           }}
-          {{ row[col.field] && col.percentage ? " %" : "" }}
+          {{ getNestedValue(row,col.field) && col.percentage ? " %" : "" }}
         </ng-container>
         <ng-container *ngIf="!col.text && col.currencyCode">
-          {{ row[col.field] | currency : col.currencyCode }}
-          {{ row[col.field] && col.percentage ? " %" : "" }}
+          {{ getNestedValue(row,col.field) | currency : col.currencyCode }}
+          {{ getNestedValue(row,col.field) && col.percentage ? " %" : "" }}
         </ng-container>
         <!-- hardcoded text columns -->
         <ng-container *ngIf="col.text">
@@ -104,7 +104,7 @@
         </ng-container>
         <ng-container *ngIf="col.translateBoolean">
           {{
-            row[col.field]
+            getNestedValue(row, col.field)
               | translateBoolean
                 : locale
                 : col.translateBoolean.trueRepresentations!
@@ -112,7 +112,7 @@
           }}
         </ng-container>
         <ng-container *ngIf="col.translateEnum">
-          {{ row[col.field] | translateEnum : col.translateEnum }}
+          {{ getNestedValue(row,col.field) | translateEnum : col.translateEnum }}
         </ng-container>
         <!-- fallback -->
         <ng-container
@@ -128,29 +128,38 @@
             !col.maxLength
           "
         >
-          {{ row[col.field] }}
+          {{ getNestedValue(row, col.field) }}
         </ng-container>
         <ng-container *ngIf="col.maxLength">
-          <span pTooltip="{{ row[col.field] }}">{{
-            row[col.field] | truncate : col.maxLength
+          <span pTooltip="{{ getNestedValue(row,col.field) }}">{{
+            getNestedValue(row, col.field) | truncate : col.maxLength
           }}</span>
         </ng-container>
         <!-- URL -->
         <ng-container *ngIf="col.url === true">
-          <a [href]="prependUrl(row[col.field])" target="_blank">{{
-            row[col.field]
-          }}</a>
+          <a
+            [href]="prependUrl(getNestedValue(row, col.field))"
+            target="_blank"
+            >{{ getNestedValue(row, col.field) }}</a
+          >
         </ng-container>
         <!-- Translate entity -->
         <ng-container *ngIf="col.translateEntity">
-          <ng-container *ngIf="col.navigable && row[col.field]">
-            <button type="button" class="btn btn-link" (click)="navigate(row, col)">
-              {{row[col.field] | translateEntity : col.translateEntity.property }}
+          <ng-container *ngIf="col.navigable && getNestedValue(row,col.field)">
+            <button
+              type="button"
+              class="btn btn-link"
+              (click)="navigate(row, col)"
+            >
+              {{
+                getNestedValue(row, col.field)
+                  | translateEntity : col.translateEntity.property
+              }}
             </button>
           </ng-container>
           <ng-container *ngIf="!col.navigable">
             {{
-              row[col.field] | translateEntity : col.translateEntity.property
+              getNestedValue(row,col.field) | translateEntity : col.translateEntity.property
             }}
           </ng-container>
         </ng-container>
@@ -159,7 +168,7 @@
         <button
           type="submit"
           class="btn btn-primary"
-          pTooltip=" {{ 'to_details_screen' | translate}}"
+          pTooltip=" {{ 'to_details_screen' | translate }}"
           (click)="onDetailButtonClick(row)"
         >
           <span class="pi pi-pencil"></span>
@@ -169,7 +178,7 @@
         <button
           type="submit"
           class="btn btn-danger"
-          pTooltip=" {{ 'delete' | translate}}"
+          pTooltip=" {{ 'delete' | translate }}"
           (click)="onDeleteClick(row)"
         >
           <span class="pi pi-trash"></span>
diff --git a/dynamo-angular/shared/components/data-table/data-table.component.ts b/dynamo-angular/shared/components/data-table/data-table.component.ts
index a197f378a..e139bc6b9 100644
--- a/dynamo-angular/shared/components/data-table/data-table.component.ts
+++ b/dynamo-angular/shared/components/data-table/data-table.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { TableLazyLoadEvent } from 'primeng/table';
 import { MenuItem } from 'primeng/api';
 import { Router } from '@angular/router';
-import { adjustTimestamp, prependUrl } from '../../functions/functions';
+import { adjustTimestamp, prependUrl, getNestedValue } from '../../functions/functions';
 import { ConfirmService } from '../../service/confirm.service';
 
 /**
@@ -179,6 +179,10 @@ export class DataTableComponent implements OnInit {
     let link = `${col.navigateLink}/${row[col.field]['id']} `
     this.router.navigateByUrl(link)
   }
+
+  getNestedValue(row: any, name: string) {
+    return getNestedValue(row, name);
+  }
 }
 
 export interface TableColumn {
diff --git a/dynamo-angular/shared/components/date-field/date-field.component.html b/dynamo-angular/shared/components/date-field/date-field.component.html
index 760229081..dc0230953 100644
--- a/dynamo-angular/shared/components/date-field/date-field.component.html
+++ b/dynamo-angular/shared/components/date-field/date-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/date-field/date-field.component.ts b/dynamo-angular/shared/components/date-field/date-field.component.ts
index 1882f522f..25ae307c4 100644
--- a/dynamo-angular/shared/components/date-field/date-field.component.ts
+++ b/dynamo-angular/shared/components/date-field/date-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/decimal-field/decimal-field.component.html b/dynamo-angular/shared/components/decimal-field/decimal-field.component.html
index ee96c1186..98f5d498e 100644
--- a/dynamo-angular/shared/components/decimal-field/decimal-field.component.html
+++ b/dynamo-angular/shared/components/decimal-field/decimal-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/decimal-field/decimal-field.component.ts b/dynamo-angular/shared/components/decimal-field/decimal-field.component.ts
index f4a213767..fe8984634 100644
--- a/dynamo-angular/shared/components/decimal-field/decimal-field.component.ts
+++ b/dynamo-angular/shared/components/decimal-field/decimal-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/details-grid/details-grid.component.html b/dynamo-angular/shared/components/details-grid/details-grid.component.html
index 44cabe77f..ed4592dbc 100644
--- a/dynamo-angular/shared/components/details-grid/details-grid.component.html
+++ b/dynamo-angular/shared/components/details-grid/details-grid.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
     [lazy]="false"
     [rows]="pageSize"
     styleClass="p-datatable-sm"
-    [paginator]="true"
+    [paginator]="am!.showDetailsPaginator"
     [totalRecords]="getTotalRecords()"
     [showCurrentPageReport]="false"
     currentPageReportTemplate="Show {first} to {last} of {totalRecords} items"
diff --git a/dynamo-angular/shared/components/details-grid/details-grid.component.ts b/dynamo-angular/shared/components/details-grid/details-grid.component.ts
index 53d794107..8439d77db 100644
--- a/dynamo-angular/shared/components/details-grid/details-grid.component.ts
+++ b/dynamo-angular/shared/components/details-grid/details-grid.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -65,13 +65,14 @@ export class DetailsGridComponent
   extends BaseCompositeComponent
   implements OnInit, OnChanges
 {
-
   // parent entity name
-  @Input({required:true}) parentEntityName!: string;
+  @Input({ required: true }) parentEntityName!: string;
+  // parent entity name
+  @Input({ required: true }) am!: AttributeModelResponse;
   // parent reference name
   @Input() parentReference?: string;
   // the name of the attribute
-  @Input({required:true}) attributeName!: string;
+  @Input({ required: true }) attributeName!: string;
   // the entity model
   @Input() override entityModel?: EntityModelResponse = undefined;
   // the objects/rows that are being edited
@@ -198,8 +199,11 @@ export class DetailsGridComponent
     am: AttributeModelResponse
   ): Observable<[AttributeModelResponse, EntityModelResponse]> {
     return this.entityModelService
-      .getNestedEntityModel2(this.parentEntityName, this.attributeName, am.name,
-          this.parentReference
+      .getNestedEntityModel2(
+        this.parentEntityName,
+        this.attributeName,
+        am.name,
+        this.parentReference
       )
       .pipe((obs) => zip(of(am), obs));
   }
diff --git a/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.html b/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.html
index 815f06333..47be73b16 100644
--- a/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.html
+++ b/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.ts b/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.ts
index fde19a9e3..47642ca9d 100644
--- a/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.ts
+++ b/dynamo-angular/shared/components/element-collection-dialog/element-collection-dialog.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.html b/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.html
index d4e210eee..8f795ff0a 100644
--- a/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.html
+++ b/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.ts b/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.ts
index 3e46b44b8..add91377e 100644
--- a/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.ts
+++ b/dynamo-angular/shared/components/element-collection-field/element-collection-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.html b/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.html
index 8269c46ed..36f45e611 100644
--- a/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.html
+++ b/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.ts b/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.ts
index b93aaba0b..1869dc694 100644
--- a/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.ts
+++ b/dynamo-angular/shared/components/entity-popup-dialog/entity-popup-dialog.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/enum-field/enum-field.component.html b/dynamo-angular/shared/components/enum-field/enum-field.component.html
index 17ba46085..bbad31d2a 100644
--- a/dynamo-angular/shared/components/enum-field/enum-field.component.html
+++ b/dynamo-angular/shared/components/enum-field/enum-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/enum-field/enum-field.component.ts b/dynamo-angular/shared/components/enum-field/enum-field.component.ts
index 1ec057933..a9d91d329 100644
--- a/dynamo-angular/shared/components/enum-field/enum-field.component.ts
+++ b/dynamo-angular/shared/components/enum-field/enum-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/field-view-table/field-view-table.component.html b/dynamo-angular/shared/components/field-view-table/field-view-table.component.html
index 307f26f79..14c34a476 100644
--- a/dynamo-angular/shared/components/field-view-table/field-view-table.component.html
+++ b/dynamo-angular/shared/components/field-view-table/field-view-table.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
   [rows]="pageSize"
   [pageLinks]="10"
   styleClass="p-datatable-sm"
-  [paginator]="false"
+  [paginator]="am!.showDetailsPaginator"
   [showCurrentPageReport]="false"
   currentPageReportTemplate="Show {first} to {last} of {totalRecords} items"
   [rowsPerPageOptions]="[10, 25, 50]"
diff --git a/dynamo-angular/shared/components/field-view-table/field-view-table.component.ts b/dynamo-angular/shared/components/field-view-table/field-view-table.component.ts
index 8b96e51a8..33b874b6e 100644
--- a/dynamo-angular/shared/components/field-view-table/field-view-table.component.ts
+++ b/dynamo-angular/shared/components/field-view-table/field-view-table.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,6 +41,7 @@ export class FieldViewTableComponent
   extends BaseCompositeComponent
   implements OnInit
 {
+  @Input({required: true}) am!: AttributeModelResponse;
   @Input() override entityModel: EntityModelResponse | undefined;
   @Input() rows: any[] | undefined = [];
 
@@ -91,6 +92,10 @@ export class FieldViewTableComponent
     return this.rows ? this.rows.sort((a, b) => a.id - b.id) : [];
   }
 
+  showPaginator() {
+
+  }
+
   protected override onLookupFilled(am: AttributeModelResponse): void {
     // do nothing
   }
diff --git a/dynamo-angular/shared/components/field-view/field-view.component.html b/dynamo-angular/shared/components/field-view/field-view.component.html
index bb8894016..97cef5076 100644
--- a/dynamo-angular/shared/components/field-view/field-view.component.html
+++ b/dynamo-angular/shared/components/field-view/field-view.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -113,6 +113,7 @@
   </span>
   <span *ngIf="isNestedDetail(am)">
     <app-field-view-table
+      [am]="am"
       [entityName]="am.lookupEntityName!"
       [entityModel]="nestedEntityModel"
       [rows]="getNestedValue(entity, am)"
diff --git a/dynamo-angular/shared/components/field-view/field-view.component.ts b/dynamo-angular/shared/components/field-view/field-view.component.ts
index 09750c411..991ae1b79 100644
--- a/dynamo-angular/shared/components/field-view/field-view.component.ts
+++ b/dynamo-angular/shared/components/field-view/field-view.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/file-upload/file-upload.component.html b/dynamo-angular/shared/components/file-upload/file-upload.component.html
index 341091b4f..9b13e17f2 100644
--- a/dynamo-angular/shared/components/file-upload/file-upload.component.html
+++ b/dynamo-angular/shared/components/file-upload/file-upload.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/file-upload/file-upload.component.ts b/dynamo-angular/shared/components/file-upload/file-upload.component.ts
index 1ebb1a3b8..76a091b4c 100644
--- a/dynamo-angular/shared/components/file-upload/file-upload.component.ts
+++ b/dynamo-angular/shared/components/file-upload/file-upload.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.html b/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.html
index 4cff1f3b3..06af81240 100644
--- a/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.html
+++ b/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.ts b/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.ts
index 4e0ea79b8..e1028bcd9 100644
--- a/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.ts
+++ b/dynamo-angular/shared/components/flexible-search-form/flexible-search-form.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.html b/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.html
index bbdd04d77..45d12ace7 100644
--- a/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.html
+++ b/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,6 +41,7 @@ <h4>{{ tableCaptionPlural }}</h4>
     [injectedCustomInputs]="customInputs"
     [hiddenFieldService]="hiddenFieldService"
     [popupButtonMode]="popupButtonMode"
+    [modelActionEnabled]="modelActionEnabled"
     (onSearchComplete)="searchComplete()"
   />
   <ng-template #popupDialogContainerRef></ng-template>
diff --git a/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.ts b/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.ts
index d8d4b9f93..806177b98 100644
--- a/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.ts
+++ b/dynamo-angular/shared/components/generic-edit-table-layout/generic-edit-table-layout.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-field/generic-field.component.html b/dynamo-angular/shared/components/generic-field/generic-field.component.html
index 9cef72752..f577155f5 100644
--- a/dynamo-angular/shared/components/generic-field/generic-field.component.html
+++ b/dynamo-angular/shared/components/generic-field/generic-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-field/generic-field.component.ts b/dynamo-angular/shared/components/generic-field/generic-field.component.ts
index e7f187b63..2a4ff504c 100644
--- a/dynamo-angular/shared/components/generic-field/generic-field.component.ts
+++ b/dynamo-angular/shared/components/generic-field/generic-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.html b/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.html
index 45f54d0a0..57f715bd0 100644
--- a/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.html
+++ b/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.html
@@ -18,168 +18,172 @@
   #L%
   -->
 <div *ngIf="entityModel">
-    <ng-container
-        *ngIf="getAttributeModelGroups().length > 1 && useGroupPanels()"
+  <ng-container
+    *ngIf="getAttributeModelGroups().length > 1 && useGroupPanels()"
+  >
+    <!-- Grouped attributes (panels)-->
+    <p-panel
+      *ngFor="let group of getAttributeModelGroups()"
+      [header]="getGroupDescription(group)"
+      [toggleable]="true"
+      class="pb-2"
     >
-        <!-- Grouped attributes (panels)-->
-        <p-panel
-            *ngFor="let group of getAttributeModelGroups()"
-            [header]="getGroupDescription(group)"
-            [toggleable]="true"
-            class="pb-2"
+      <div class="row">
+        <div
+          *ngFor="let am of getAttributeModelsForGroup(group)"
+          [class]="getColumnsClass()"
         >
-            <div class="row">
-                <div
-                    *ngFor="let am of getAttributeModelsForGroup(group)"
-                    [class]="getColumnsClass()"
-                >
-                    <ng-container
-                        *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
-                    >
-                    </ng-container>
-                </div>
-            </div>
-        </p-panel>
-    </ng-container>
-    <!-- Grouped attributes (tabs) -->
-    <ng-container *ngIf="getAttributeModelGroups().length > 1 && useGroupTabs()">
-        <p-tabView>
-            <p-tabPanel
-                *ngFor="let group of getAttributeModelGroups()"
-                [header]="getGroupDescription(group)"
-            >
-                <div class="row">
-                    <div
-                        *ngFor="let am of getAttributeModelsForGroup(group)"
-                        [class]="getColumnsClass()"
-                    >
-                        <ng-container
-                            *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
-                        >
-                        </ng-container>
-                    </div>
-                </div>
-            </p-tabPanel>
-        </p-tabView>
-    </ng-container>
-    <!-- No explicitly defined groups -->
-    <ng-container *ngIf="getAttributeModelGroups().length === 1">
+          <ng-container
+            *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
+          >
+          </ng-container>
+        </div>
+      </div>
+    </p-panel>
+  </ng-container>
+  <!-- Grouped attributes (tabs) -->
+  <ng-container *ngIf="getAttributeModelGroups().length > 1 && useGroupTabs()">
+    <p-tabView>
+      <p-tabPanel
+        *ngFor="let group of getAttributeModelGroups()"
+        [header]="getGroupDescription(group)"
+      >
         <div class="row">
-            <div
-                *ngFor="let am of getUngroupedAttributeModels(attributeModels)"
-                [class]="getColumnsClass()"
+          <div
+            *ngFor="let am of getAttributeModelsForGroup(group)"
+            [class]="getColumnsClass()"
+          >
+            <ng-container
+              *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
             >
-                <ng-container
-                    *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
-                >
-                </ng-container>
-            </div>
+            </ng-container>
+          </div>
         </div>
-    </ng-container>
+      </p-tabPanel>
+    </p-tabView>
+  </ng-container>
+  <!-- No explicitly defined groups -->
+  <ng-container *ngIf="getAttributeModelGroups().length === 1">
+    <div class="row">
+      <div
+        *ngFor="let am of getUngroupedAttributeModels(attributeModels)"
+        [class]="getColumnsClass()"
+      >
+        <ng-container
+          *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
+        >
+        </ng-container>
+      </div>
+    </div>
+  </ng-container>
 </div>
 
 <ng-template #formTemplate let-am>
-    <ng-container *ngIf="isAttributeVisible(am)">
-        <ng-container *ngIf="!hasGroupTogetherWith(am)">
-            <div class="row pt-2 pb-2">
-                <ng-container *ngIf="isNestedDetail(am) && getNestedEntityModel(am)">
-                    <div
-                        [pTooltip]="am.descriptions[locale]"
-                        class="col-12 text-truncate"
-                    >
-                        {{ am.displayNames[locale] }}
-                    </div>
-                    <div class="col-12">
-                        <app-field-view
-                            [am]="am"
-                            [entity]="entity"
-                            [entityName]="entityName"
-                            [enumMap]="getEnumMap(am)"
-                            [locale]="locale"
-                            [nestedEntityModel]="getNestedEntityModel(am)"
-                            [showEmptyValueLabel]="true"
-                        ></app-field-view>
-                    </div>
-                </ng-container>
-                <ng-container *ngIf="!(isNestedDetail(am) && getNestedEntityModel(am))">
-                    <div
-                        [pTooltip]="am.descriptions[locale]"
-                        class="col-lg-4 col-md-4 col-sm-6 text-truncate"
-                    >
-                        {{ am.displayNames[locale] }}
-                    </div>
-                    <div class="col-lg-8 col-md-4 col-sm-6">
-                        <app-field-view
-                            [am]="am"
-                            [entity]="entity"
-                            [entityName]="entityName"
-                            [enumMap]="getEnumMap(am)"
-                            [locale]="locale"
-                            [nestedEntityModel]="getNestedEntityModel(am)"
-                            [showEmptyValueLabel]="true"
-                        ></app-field-view>
-                    </div>
-                </ng-container>
-            </div>
+  <ng-container *ngIf="isAttributeVisible(am)">
+    <ng-container *ngIf="!hasGroupTogetherWith(am)">
+      <div class="row pt-2 pb-2">
+        <ng-container *ngIf="isNestedDetail(am) && getNestedEntityModel(am)">
+          <div
+            [pTooltip]="am.descriptions[locale]"
+            class="col-12 text-truncate"
+          >
+            {{ am.displayNames[locale] }}
+          </div>
+          <div class="col-12">
+            <app-field-view
+              [am]="am"
+              [entity]="entity"
+              [entityName]="entityName"
+              [enumMap]="getEnumMap(am)"
+              [locale]="locale"
+              [nestedEntityModel]="getNestedEntityModel(am)"
+              [showEmptyValueLabel]="true"
+            ></app-field-view>
+          </div>
+        </ng-container>
+        <ng-container *ngIf="!isNestedDetail(am)">
+          <div
+            [pTooltip]="am.descriptions[locale]"
+            class="col-lg-4 col-md-4 col-sm-6 text-truncate"
+          >
+            {{ am.displayNames[locale] }}
+          </div>
+          <div class="col-lg-8 col-md-4 col-sm-6">
+            <app-field-view
+              [am]="am"
+              [entity]="entity"
+              [entityName]="entityName"
+              [enumMap]="getEnumMap(am)"
+              [locale]="locale"
+              [nestedEntityModel]="getNestedEntityModel(am)"
+              [showEmptyValueLabel]="true"
+            ></app-field-view>
+          </div>
         </ng-container>
-        <ng-container *ngIf="hasGroupTogetherWith(am)">
-            <div class="row pt-2 pb-2">
-                <div [class]="getGroupTogetherColClass(am)">
-                    <div class="row pt-2 pb-2">
-                        <ng-container *ngIf="isNestedDetail(am) && getNestedEntityModel(am)">
-                            <div
-                                [pTooltip]="am.descriptions[locale]"
-                                class="col-12 text-truncate"
-                            >
-                                {{ am.displayNames[locale] }}
-                            </div>
-                            <div class="col-12">
-                                <app-field-view
-                                    [am]="am"
-                                    [entity]="entity"
-                                    [entityName]="entityName"
-                                    [enumMap]="getEnumMap(am)"
-                                    [locale]="locale"
-                                    [nestedEntityModel]="getNestedEntityModel(am)"
-                                    [showEmptyValueLabel]="true"
-                                ></app-field-view>
-                            </div>
-                        </ng-container>
-                        <ng-container *ngIf="!(isNestedDetail(am) && getNestedEntityModel(am))">
-                            <p>hoi</p>
-                            <div
-                                [pTooltip]="am.descriptions[locale]"
-                                class="col-lg-4 col-md-4 col-sm-6 text-truncate"
-                            >
-                                {{ am.displayNames[locale] }}
-                            </div>
-                            <div class="col-lg-8 col-md-4 col-sm-6">
-                                <app-field-view
-                                    [am]="am"
-                                    [entity]="entity"
-                                    [entityName]="entityName"
-                                    [enumMap]="getEnumMap(am)"
-                                    [locale]="locale"
-                                    [nestedEntityModel]="getNestedEntityModel(am)"
-                                    [showEmptyValueLabel]="true"
-                                ></app-field-view>
-                            </div>
-                        </ng-container>
-                    </div>
-                </div>
-                <div
-                    [class]="getGroupTogetherColClass(am)"
-                    *ngFor="let gam of am.groupTogetherWith"
-                >
-                    <ng-container
-                        *ngTemplateOutlet="
+      </div>
+    </ng-container>
+    <ng-container *ngIf="hasGroupTogetherWith(am)">
+      <div class="row pt-2 pb-2">
+        <div [class]="getGroupTogetherColClass(am)">
+          <div class="row pt-2 pb-2">
+            <ng-container
+              *ngIf="isNestedDetail(am) && getNestedEntityModel(am)"
+            >
+              <div
+                [pTooltip]="am.descriptions[locale]"
+                class="col-12 text-truncate"
+              >
+                {{ am.displayNames[locale] }}
+              </div>
+              <div class="col-12">
+                <app-field-view
+                  [am]="am"
+                  [entity]="entity"
+                  [entityName]="entityName"
+                  [enumMap]="getEnumMap(am)"
+                  [locale]="locale"
+                  [nestedEntityModel]="getNestedEntityModel(am)"
+                  [showEmptyValueLabel]="true"
+                ></app-field-view>
+              </div>
+            </ng-container>
+            <ng-container
+              *ngIf="!(isNestedDetail(am) && getNestedEntityModel(am))"
+            >
+              <p>hoi</p>
+              <div
+                [pTooltip]="am.descriptions[locale]"
+                class="col-lg-4 col-md-4 col-sm-6 text-truncate"
+              >
+                {{ am.displayNames[locale] }}
+              </div>
+              <div class="col-lg-8 col-md-4 col-sm-6">
+                <app-field-view
+                  [am]="am"
+                  [entity]="entity"
+                  [entityName]="entityName"
+                  [enumMap]="getEnumMap(am)"
+                  [locale]="locale"
+                  [nestedEntityModel]="getNestedEntityModel(am)"
+                  [showEmptyValueLabel]="true"
+                ></app-field-view>
+              </div>
+            </ng-container>
+          </div>
+        </div>
+        <div
+          [class]="getGroupTogetherColClass(am)"
+          *ngFor="let gam of am.groupTogetherWith"
+        >
+          <ng-container
+            *ngTemplateOutlet="
               formTemplate;
               context: { $implicit: findAttributeModel(gam) }
             "
-                    >
-                    </ng-container>
-                </div>
-            </div>
-        </ng-container>
+          >
+          </ng-container>
+        </div>
+      </div>
     </ng-container>
+  </ng-container>
 </ng-template>
diff --git a/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.ts b/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.ts
index 609b61df2..c3517ec14 100644
--- a/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.ts
+++ b/dynamo-angular/shared/components/generic-form-view/generic-form-view.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-form/generic-form.component.html b/dynamo-angular/shared/components/generic-form/generic-form.component.html
index 36a3a1f0b..37b82d061 100644
--- a/dynamo-angular/shared/components/generic-form/generic-form.component.html
+++ b/dynamo-angular/shared/components/generic-form/generic-form.component.html
@@ -22,370 +22,374 @@ <h5 *ngIf="!entityId && entityModel">{{ getNewObjectCaption() }}</h5>
 <h5 *ngIf="entityId && entityModel">{{ getUpdateObjectCaption() }}</h5>
 <p-divider></p-divider>
 <ng-container *ngIf="freeFormMode">
-    <!-- Free form mode, only provide a template that offers access to the form group -->
-    <ng-container
-        [ngTemplateOutlet]="freeFormTemplate || defaultFreeFormTemplate"
-        [ngTemplateOutletContext]="{ $implicit: mainForm }"
-    >
-    </ng-container>
-    <ng-template #defaultFreeFormTemplate let-mainForm> </ng-template>
+  <!-- Free form mode, only provide a template that offers access to the form group -->
+  <ng-container
+    [ngTemplateOutlet]="freeFormTemplate || defaultFreeFormTemplate"
+    [ngTemplateOutletContext]="{ $implicit: mainForm }"
+  >
+  </ng-container>
+  <ng-template #defaultFreeFormTemplate let-mainForm> </ng-template>
 </ng-container>
 <ng-container *ngIf="!freeFormMode">
-    <!-- View mode only -->
-    <div *ngIf="viewMode || !isWriteAllowed()">
-        <div [class]="getFormWidthClass()">
-            <app-generic-form-view
-                [entity]="editObject"
-                [locale]="locale"
-                [entityModel]="entityModel"
-                [entityName]="entityName"
-                [nestedEntityModelMap]="nestedEntityModelMap"
-                [attributeGroupMode]="attributeGroupMode"
-                [numberOfColumns]="numberOfColumns"
-                *ngIf="editObject.id"
-                [attributeVisible]="attributeVisible"
-                [formGroup]="mainForm"
-            />
-        </div>
-        <div class="btn-group" role="group" *ngIf="entityModel">
-            <button
-                type="button"
-                class="btn btn-primary m-1"
-                (click)="back()"
-                *ngIf="backEnabled()"
-            >
-                <span class="pi pi-arrow-left"></span> {{ "back" | translate }}
-            </button>
-            <button
-                type="button"
-                *ngIf="nested"
-                class="btn btn-danger m-1"
-                (click)="closeDialog()"
-            >
-                <span class="pi pi-times"></span> {{ "close" | translate }}
-            </button>
-            <button
-                type="button"
-                class="btn btn-primary m-1"
-                (click)="editMode()"
-                *ngIf="
+  <!-- View mode only -->
+  <div *ngIf="viewMode || !isWriteAllowed()">
+    <div [class]="getFormWidthClass()">
+      <app-generic-form-view
+        [entity]="editObject"
+        [locale]="locale"
+        [entityModel]="entityModel"
+        [entityName]="entityName"
+        [nestedEntityModelMap]="nestedEntityModelMap"
+        [attributeGroupMode]="attributeGroupMode"
+        [numberOfColumns]="numberOfColumns"
+        *ngIf="editObject.id"
+        [attributeVisible]="attributeVisible"
+        [formGroup]="mainForm"
+      />
+    </div>
+    <div class="btn-group" role="group" *ngIf="entityModel">
+      <button
+        type="button"
+        class="btn btn-primary m-1"
+        (click)="back()"
+        *ngIf="backEnabled()"
+      >
+        <span class="pi pi-arrow-left"></span> {{ "back" | translate }}
+      </button>
+      <button
+        type="button"
+        *ngIf="nested"
+        class="btn btn-danger m-1"
+        (click)="closeDialog()"
+      >
+        <span class="pi pi-times"></span> {{ "close" | translate }}
+      </button>
+      <button
+        type="button"
+        class="btn btn-primary m-1"
+        (click)="editMode()"
+        *ngIf="
           entityModel.updateAllowed && this.isWriteAllowed() && !this.readOnly
         "
-            >
-                <span class="pi pi-pencil"></span> {{ "edit" | translate }}
-            </button>
-            <button
-                *ngFor="let action of filterEntityModelActions()"
-                type="button"
-                class="btn btn-primary m-1"
-                (click)="callModelAction(vcr, action)"
-            >
-                <span class="pi {{ action.icon }}"></span>
-                {{ action.displayNames[locale] }}
-            </button>
-            <button
-                *ngFor="let action of filterAdditionalActions()"
-                type="submit"
-                class="btn btn-primary m-1"
-                [disabled]="loading"
-                (click)="callAdditionalAction(action)"
-                [class]="action.buttonClass"
-                [disabled]="isDisabled(action)"
-            >
-                <span *ngIf="action.icon" class="pi {{ action.icon }}"></span>
-                {{ action.messageKey | translate }}
-            </button>
+      >
+        <span class="pi pi-pencil"></span> {{ "edit" | translate }}
+      </button>
+      <button
+        *ngFor="let action of filterEntityModelActions()"
+        type="button"
+        class="btn btn-primary m-1"
+        [disabled]="!isModelActionEnabled(action)"
+        (click)="callModelAction(vcr, action)"
+      >
+        <span class="pi {{ action.icon }}"></span>
+        {{ action.displayNames[locale] }}
+      </button>
+      <button
+        *ngFor="let action of filterAdditionalActions()"
+        type="submit"
+        class="btn btn-primary m-1"
+        [disabled]="loading"
+        (click)="callAdditionalAction(action)"
+        [class]="action.buttonClass"
+        [disabled]="isAdditionalFormActionDisabled(action)"
+      >
+        <span *ngIf="action.icon" class="pi {{ action.icon }}"></span>
+        {{ action.messageKey | translate }}
+      </button>
 
-            <ng-template #popupDialogContainerRef></ng-template>
-        </div>
+      <ng-template #popupDialogContainerRef></ng-template>
     </div>
+  </div>
 
-    <div *ngIf="!viewMode && isWriteAllowed()" class="row">
-        <form id="edit-form" *ngIf="mainForm">
-            <div [class]="getFormWidthClass()">
-                <!-- Grouped attributes (panels) -->
+  <div *ngIf="!viewMode && isWriteAllowed()" class="row">
+    <form id="edit-form" *ngIf="mainForm">
+      <div [class]="getFormWidthClass()">
+        <!-- Grouped attributes (panels) -->
+        <ng-container
+          *ngIf="getAttributeModelGroups().length > 1 && useGroupPanels()"
+        >
+          <p-panel
+            *ngFor="let group of getAttributeModelGroups()"
+            [header]="getGroupDescription(group)"
+            [toggleable]="true"
+            class="pb-2"
+          >
+            <div class="row">
+              <div
+                *ngFor="let am of getAttributeModelsForGroup(group)"
+                [formGroup]="mainForm"
+                [class]="getColumnsClass()"
+              >
                 <ng-container
-                    *ngIf="getAttributeModelGroups().length > 1 && useGroupPanels()"
+                  *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
                 >
-                    <p-panel
-                        *ngFor="let group of getAttributeModelGroups()"
-                        [header]="getGroupDescription(group)"
-                        [toggleable]="true"
-                        class="pb-2"
-                    >
-                        <div class="row">
-                            <div
-                                *ngFor="let am of getAttributeModelsForGroup(group)"
-                                [formGroup]="mainForm"
-                                [class]="getColumnsClass()"
-                            >
-                                <ng-container
-                                    *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
-                                >
-                                </ng-container>
-                            </div>
-                        </div>
-                    </p-panel>
                 </ng-container>
-                <!-- Grouped attributes (tabs) -->
-                <ng-container
-                    *ngIf="getAttributeModelGroups().length > 1 && useGroupTabs()"
+              </div>
+            </div>
+          </p-panel>
+        </ng-container>
+        <!-- Grouped attributes (tabs) -->
+        <ng-container
+          *ngIf="getAttributeModelGroups().length > 1 && useGroupTabs()"
+        >
+          <p-tabView>
+            <p-tabPanel
+              *ngFor="let group of getAttributeModelGroups()"
+              [header]="getGroupDescription(group)"
+            >
+              <div class="row">
+                <div
+                  *ngFor="let am of getAttributeModelsForGroup(group)"
+                  [formGroup]="mainForm"
+                  [class]="getColumnsClass()"
                 >
-                    <p-tabView>
-                        <p-tabPanel
-                            *ngFor="let group of getAttributeModelGroups()"
-                            [header]="getGroupDescription(group)"
-                        >
-                            <div class="row">
-                                <div
-                                    *ngFor="let am of getAttributeModelsForGroup(group)"
-                                    [formGroup]="mainForm"
-                                    [class]="getColumnsClass()"
-                                >
-                                    <ng-container
-                                        *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
-                                    >
-                                    </ng-container>
-                                </div>
-                            </div>
-                        </p-tabPanel>
-                    </p-tabView>
-                </ng-container>
-                <!-- No explicitly defined groups -->
-                <ng-container *ngIf="getAttributeModelGroups().length == 1">
-                    <div class="row">
-                        <div
-                            *ngFor="
+                  <ng-container
+                    *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
+                  >
+                  </ng-container>
+                </div>
+              </div>
+            </p-tabPanel>
+          </p-tabView>
+        </ng-container>
+        <!-- No explicitly defined groups -->
+        <ng-container *ngIf="getAttributeModelGroups().length == 1">
+          <div class="row">
+            <div
+              *ngFor="
                 let am of getUngroupedAttributeModels(
                   this.visibleAttributeModels
                 )
               "
-                            [formGroup]="mainForm"
-                            [class]="getColumnsClass()"
-                        >
-                            <ng-container
-                                *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
-                            >
-                            </ng-container>
-                        </div>
-                    </div>
-                </ng-container>
+              [formGroup]="mainForm"
+              [class]="getColumnsClass()"
+            >
+              <ng-container
+                *ngTemplateOutlet="formTemplate; context: { $implicit: am }"
+              >
+              </ng-container>
             </div>
-            <ng-container
-                [ngTemplateOutlet]="
+          </div>
+        </ng-container>
+      </div>
+      <ng-container
+        [ngTemplateOutlet]="
           customValidatorTemplate || defaultCustomValidatorTemplate
         "
-                [ngTemplateOutletContext]="{ $implicit: mainForm }"
-            >
-            </ng-container>
-        </form>
-        <div *ngIf="mainForm" class="pt-2">
-            <div class="btn-group" role="group">
-                <!-- Navigate back button -->
-                <button
-                    type="button"
-                    class="btn btn-primary m-1"
-                    (click)="back()"
-                    *ngIf="backEnabled()"
-                    [disabled]="loading"
-                >
-                    <span class="pi pi-arrow-left"></span>
-                    {{ "back" | translate }}
-                </button>
-                <!-- Cancel -->
-                <button
-                    type="submit"
-                    class="btn btn-primary m-1"
-                    [disabled]="loading"
-                    (click)="cancelEdit()"
-                    *ngIf="!nested && openInViewMode && entityId"
-                >
-                    <span class="pi pi-ban"></span> {{ "cancel" | translate }}
-                </button>
-                <!-- Save button -->
-                <button
-                    type="submit"
-                    class="btn btn-primary m-1"
-                    [disabled]="loading"
-                    (click)="save()"
-                >
-                    <span class="pi pi-save"></span> {{ "save" | translate }}
-                </button>
-                <button
-                    type="button"
-                    *ngIf="formFillEnabled && !nested"
-                    class="btn btn-primary m-1"
-                    (click)="showFormFillDialog()"
-                >
-                    <span class="pi pi-filter-fill"></span> {{ "ai_fill" | translate }}
-                </button>
-                <ng-template #formFillContainerRef></ng-template>
-                <!-- Close button (only visible when nested inside popup)-->
-                <button
-                    type="button"
-                    *ngIf="nested"
-                    class="btn btn-danger m-1"
-                    (click)="closeDialog()"
-                >
-                    <span class="pi pi-times"></span> {{ "close" | translate }}
-                </button>
-                <!-- Extra UI actions-->
-                <ng-container *ngFor="let action of filterAdditionalActions()">
-                    <ng-container
-                        *ngTemplateOutlet="
+        [ngTemplateOutletContext]="{ $implicit: mainForm }"
+      >
+      </ng-container>
+    </form>
+    <div *ngIf="mainForm" class="pt-2">
+      <div class="btn-group" role="group">
+        <!-- Navigate back button -->
+        <button
+          type="button"
+          class="btn btn-primary m-1"
+          (click)="back()"
+          *ngIf="backEnabled()"
+          [disabled]="loading"
+        >
+          <span class="pi pi-arrow-left"></span>
+          {{ "back" | translate }}
+        </button>
+        <!-- Cancel -->
+        <button
+          type="submit"
+          class="btn btn-primary m-1"
+          [disabled]="loading"
+          (click)="cancelEdit()"
+          *ngIf="!nested && openInViewMode && entityId"
+        >
+          <span class="pi pi-ban"></span> {{ "cancel" | translate }}
+        </button>
+        <!-- Save button -->
+        <button
+          type="submit"
+          class="btn btn-primary m-1"
+          [disabled]="loading"
+          (click)="save()"
+        >
+          <span class="pi pi-save"></span> {{ "save" | translate }}
+        </button>
+        <button
+          *ngFor="let action of filterEntityModelActions()"
+          type="button"
+          class="btn btn-primary m-1"
+          [disabled]="!isModelActionEnabled(action)"
+          (click)="callModelAction(vcr, action)"
+        >
+          <span class="pi {{ action.icon }}"></span>
+          {{ action.displayNames[locale] }}
+        </button>
+        <ng-template #popupDialogContainerRef></ng-template>
+        <button
+          type="button"
+          *ngIf="formFillEnabled && !nested"
+          class="btn btn-primary m-1"
+          (click)="showFormFillDialog()"
+        >
+          <span class="pi pi-filter-fill"></span> {{ "ai_fill" | translate }}
+        </button>
+        <ng-template #formFillContainerRef></ng-template>
+        <!-- Close button (only visible when nested inside popup)-->
+        <button
+          type="button"
+          *ngIf="nested"
+          class="btn btn-danger m-1"
+          (click)="closeDialog()"
+        >
+          <span class="pi pi-times"></span> {{ "close" | translate }}
+        </button>
+        <!-- Extra UI actions-->
+        <ng-container *ngFor="let action of filterAdditionalActions()">
+          <ng-container
+            *ngTemplateOutlet="
               customActionTemplate;
               context: { $implicit: action }
             "
-                    >
-                    </ng-container>
-                </ng-container>
-            </div>
-        </div>
+          >
+          </ng-container>
+        </ng-container>
+      </div>
     </div>
+  </div>
 
-    <ng-template #defaultCustomValidatorTemplate> </ng-template>
+  <ng-template #defaultCustomValidatorTemplate> </ng-template>
 
-    <ng-template #customActionTemplate let-action>
-        <button
-            type="submit"
-            class="btn btn-primary m-1"
-            [disabled]="loading"
-            (click)="callAdditionalAction(action)"
-            [class]="action.buttonClass"
-            [disabled]="isDisabled(action)"
-        >
-            <span *ngIf="action.icon" class="pi {{ action.icon }}"></span>
-            {{ action.messageKey | translate }}
-        </button>
-    </ng-template>
+  <ng-template #customActionTemplate let-action>
+    <button
+      type="submit"
+      class="btn btn-primary m-1"
+      [disabled]="loading"
+      (click)="callAdditionalAction(action)"
+      [class]="action.buttonClass"
+      [disabled]="isAdditionalFormActionDisabled(action)"
+    >
+      <span *ngIf="action.icon" class="pi {{ action.icon }}"></span>
+      {{ action.messageKey | translate }}
+    </button>
+  </ng-template>
 
-    <!-- template for showing a single form field -->
-    <ng-template #formTemplate let-am>
-        <ng-container *ngIf="isEditable(am)">
-            <!-- include default-->
-            <ng-container
-                [ngTemplateOutlet]="
+  <!-- template for showing a single form field -->
+  <ng-template #formTemplate let-am>
+    <ng-container *ngIf="isEditable(am)">
+      <!-- include default-->
+      <ng-container
+        [ngTemplateOutlet]="
           getTemplateForField(am.name) || defaultFieldTemplate
         "
-                [ngTemplateOutletContext]="{ $implicit: am, mainForm: mainForm }"
-            >
-            </ng-container>
-        </ng-container>
-        <!-- Read only view -->
-        <div *ngIf="!isEditable(am) && isAttributeVisible(am)" class="row">
-            <b
-            ><label for="{{ am.name }}">{{ am.displayNames[locale] }}</label></b
-            >
-            <div class="row">
-                <div [class]="getColClass()">
-                    <app-field-view
-                        [am]="am"
-                        [entity]="editObject"
-                        [locale]="locale"
-                        [enumMap]="getEnumMap(am)"
-                        [showEmptyValueLabel]="true"
-                        *ngIf="isNestedEntityModelReady(am)"
-                    ></app-field-view>
-                </div>
-            </div>
+        [ngTemplateOutletContext]="{ $implicit: am, mainForm: mainForm }"
+      >
+      </ng-container>
+    </ng-container>
+    <!-- Read only view -->
+    <div *ngIf="!isEditable(am) && isAttributeVisible(am)" class="row">
+      <b
+        ><label for="{{ am.name }}">{{ am.displayNames[locale] }}</label></b
+      >
+      <div class="row">
+        <div [class]="getColClass()">
+          <app-field-view
+            [am]="am"
+            [entity]="editObject"
+            [locale]="locale"
+            [enumMap]="getEnumMap(am)"
+            [showEmptyValueLabel]="true"
+            *ngIf="isNestedEntityModelReady(am)"
+          ></app-field-view>
         </div>
-    </ng-template>
+      </div>
+    </div>
+  </ng-template>
 
-    <ng-template #defaultFieldTemplate let-am>
-        <ng-container *ngIf="isAttributeVisible(am)" [formGroup]="mainForm">
-            <ng-container *ngIf="!hasGroupTogetherWith(am)">
-                <ng-container *ngIf="isNestedDetail(am) && getNestedEntityModel(am)">
-                    <label class="col-12" for="{{ am.name }}">{{ am.displayNames[locale] }}</label>
-                    <app-details-grid
-                        [entityName]="am.lookupEntityName"
-                        [attributeName]="am.name"
-                        [entityModel]="getNestedEntityModel(am)"
-                        [rows]="editObject[am.name]"
-                        [formBuilder]="this.formBuilder"
-                        [formArray]="getFormArray(am)"
-                        [locale]="locale"
-                        [parentEntityName]="entityName"
-                        *ngIf="isNestedDetail(am) && getNestedEntityModel(am)"
-                    ></app-details-grid>
-                </ng-container>
-                <ng-container *ngIf="!(isNestedDetail(am) && getNestedEntityModel(am))">
-                    <label for="{{ am.name }}">{{ am.displayNames[locale] }}</label>
-                    <app-generic-field
-                        [formGroup]="mainForm"
-                        [am]="am"
-                        [enumValues]="getEnumValues(am.name)"
-                        [entityModel]="getNestedEntityModel(am)"
-                        [formControl]="getFormControl(am)"
-                        [locale]="locale"
-                        [options]="lookupEntities(am.lookupEntityName!)"
-                        [fieldFilters]="getCombinedFilters(am)"
-                        [showValidationErrors]="true"
-                        [fullWidth]="showFullWidth(am)"
-                        ngDefaultControl
-                        *ngIf="!isNestedDetail(am) && !isLob(am)"
-                    >
-                    </app-generic-field>
-                    <app-details-grid
-                        [entityName]="am.lookupEntityName"
-                        [attributeName]="am.name"
-                        [entityModel]="getNestedEntityModel(am)"
-                        [rows]="editObject[am.name]"
-                        [formBuilder]="this.formBuilder"
-                        [formArray]="getFormArray(am)"
-                        [locale]="locale"
-                        [parentEntityName]="entityName"
-                        *ngIf="isNestedDetail(am) && getNestedEntityModel(am)"
-                    ></app-details-grid>
-                    <app-file-upload
-                        [am]="am"
-                        [entityId]="entityId"
-                        [entityName]="entityName"
-                        [editObject]="editObject"
-                        (onFileUpload)="onFileUpload($event)"
-                        (onFileClear)="onFileClear($event)"
-                        *ngIf="isLob(am)"
-                    >
-                    </app-file-upload>
-                </ng-container>
-            </ng-container>
-            <ng-container *ngIf="hasGroupTogetherWith(am)">
-                <!-- Multiple attributes grouped together -->
-                <div class="row">
-                    <div [class]="getGroupTogetherColClass(am)">
-                        <label for="{{ am.name }}">{{ am.displayNames[locale] }}</label>
-                        <app-generic-field
-                            [formGroup]="mainForm"
-                            [am]="am"
-                            [enumValues]="getEnumValues(am.name)"
-                            [entityModel]="getNestedEntityModel(am)"
-                            [formControl]="getFormControl(am)"
-                            [locale]="locale"
-                            [options]="lookupEntities(am.lookupEntityName!)"
-                            [fieldFilters]="getCombinedFilters(am)"
-                            ngDefaultControl
-                            [showValidationErrors]="true"
-                            [fullWidth]="true"
-                            *ngIf="!isNestedDetail(am) && !isLob(am)"
-                        >
-                        </app-generic-field>
-                    </div>
-                    <div
-                        [class]="getGroupTogetherColClass(am)"
-                        *ngFor="let gam of am.groupTogetherWith"
-                    >
-                        <ng-container
-                            [ngTemplateOutlet]="
+  <ng-template #defaultFieldTemplate let-am>
+    <ng-container *ngIf="isAttributeVisible(am)" [formGroup]="mainForm">
+      <ng-container *ngIf="!hasGroupTogetherWith(am)">
+        <ng-container *ngIf="isNestedDetail(am) && getNestedEntityModel(am)">
+          <label class="col-12" for="{{ am.name }}">{{
+            am.displayNames[locale]
+          }}</label>
+          <app-details-grid
+            [am]="am"
+            [entityName]="am.lookupEntityName"
+            [attributeName]="am.name"
+            [entityModel]="getNestedEntityModel(am)"
+            [rows]="editObject[am.name]"
+            [formBuilder]="this.formBuilder"
+            [formArray]="getFormArray(am)"
+            [locale]="locale"
+            [parentEntityName]="entityName"
+            *ngIf="isNestedDetail(am) && getNestedEntityModel(am)"
+          ></app-details-grid>
+        </ng-container>
+        <ng-container *ngIf="!isNestedDetail(am)">
+          <label for="{{ am.name }}">{{ am.displayNames[locale] }}</label>
+          <app-generic-field
+            [formGroup]="mainForm"
+            [am]="am"
+            [enumValues]="getEnumValues(am.name)"
+            [entityModel]="getNestedEntityModel(am)"
+            [formControl]="getFormControl(am)"
+            [locale]="locale"
+            [options]="lookupEntities(am.lookupEntityName!)"
+            [fieldFilters]="getCombinedFilters(am)"
+            [showValidationErrors]="true"
+            [fullWidth]="showFullWidth(am)"
+            ngDefaultControl
+            *ngIf="!isLob(am)"
+          >
+          </app-generic-field>
+          <app-file-upload
+            [am]="am"
+            [entityId]="entityId"
+            [entityName]="entityName"
+            [editObject]="editObject"
+            (onFileUpload)="onFileUpload($event)"
+            (onFileClear)="onFileClear($event)"
+            *ngIf="isLob(am)"
+          >
+          </app-file-upload>
+        </ng-container>
+      </ng-container>
+      <ng-container *ngIf="hasGroupTogetherWith(am)">
+        <!-- Multiple attributes grouped together -->
+        <div class="row">
+          <div [class]="getGroupTogetherColClass(am)">
+            <label for="{{ am.name }}">{{ am.displayNames[locale] }}</label>
+            <app-generic-field
+              [formGroup]="mainForm"
+              [am]="am"
+              [enumValues]="getEnumValues(am.name)"
+              [entityModel]="getNestedEntityModel(am)"
+              [formControl]="getFormControl(am)"
+              [locale]="locale"
+              [options]="lookupEntities(am.lookupEntityName!)"
+              [fieldFilters]="getCombinedFilters(am)"
+              ngDefaultControl
+              [showValidationErrors]="true"
+              [fullWidth]="true"
+              *ngIf="!isNestedDetail(am) && !isLob(am)"
+            >
+            </app-generic-field>
+          </div>
+          <div
+            [class]="getGroupTogetherColClass(am)"
+            *ngFor="let gam of am.groupTogetherWith"
+          >
+            <ng-container
+              [ngTemplateOutlet]="
                 getTemplateForField(am.name) || defaultFieldTemplate
               "
-                            [ngTemplateOutletContext]="{
+              [ngTemplateOutletContext]="{
                 $implicit: findAttributeModel(gam),
                 mainForm: mainForm
               }"
-                        >
-                        </ng-container>
-                    </div>
-                </div>
+            >
             </ng-container>
-        </ng-container>
-    </ng-template>
+          </div>
+        </div>
+      </ng-container>
+    </ng-container>
+  </ng-template>
 </ng-container>
diff --git a/dynamo-angular/shared/components/generic-form/generic-form.component.ts b/dynamo-angular/shared/components/generic-form/generic-form.component.ts
index a110ee3d7..daa651586 100644
--- a/dynamo-angular/shared/components/generic-form/generic-form.component.ts
+++ b/dynamo-angular/shared/components/generic-form/generic-form.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,10 +42,10 @@ import {
   AttributeModelResponse,
   CascadeModel,
   CRUDService,
-  EntityModelActionResponse,
   ModelService,
   EntityModelResponse,
   FileService,
+  EntityModelActionResponse,
 } from 'dynamo/model';
 import { NotificationService } from '../../service/notification-service';
 import { Router } from '@angular/router';
@@ -121,6 +121,9 @@ export class GenericFormComponent
     formGroup: FormGroup
   ) => boolean;
 
+  // callback to enable/disable model action
+  @Input() modelActionEnabled?: (action: EntityModelActionResponse, editObject: any, formGroup: FormGroup) => boolean;
+
   // callback that is used to modify the event before save
   @Input() injectedHiddenFieldService?: HiddenFieldService;
 
@@ -1013,7 +1016,25 @@ export class GenericFormComponent
     );
   }
 
-  isDisabled(action: AdditionalFormAction): boolean {
+  /**
+   * Checks whether an entity model action is enabled
+   * @param action the action
+   * @returns true when the action is enabled, false otherwise
+   */
+  isModelActionEnabled(action: EntityModelActionResponse): boolean {
+    if (!this.modelActionEnabled) {
+      return true;
+    }
+
+    return this.modelActionEnabled(action, this.editObject, this.mainForm)
+  }
+
+  /**
+   * Checks whether an additional form action is enabled
+   * @param action the action
+   * @returns true when the action is disabled, false otherwise
+   */
+  isAdditionalFormActionDisabled(action: AdditionalFormAction): boolean {
     if (!action.enabled) {
       return false;
     }
@@ -1107,6 +1128,10 @@ export class GenericFormComponent
       ?.filter(
         (action) => action.type == EntityModelActionResponse.TypeEnum.UPDATE
       )
+      .filter(action => action.formMode == EntityModelActionResponse.FormModeEnum.BOTH
+          || (action.formMode == EntityModelActionResponse.FormModeEnum.EDIT && !this.viewMode)
+          || (action.formMode == EntityModelActionResponse.FormModeEnum.VIEW && this.viewMode)
+      )
       .filter((action) => this.isActionAllowed(action));
   }
 
diff --git a/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.html b/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.html
index 78c1779b5..c89793f54 100644
--- a/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.html
+++ b/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.ts b/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.ts
index 7e4fa5cc4..e51a7765d 100644
--- a/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.ts
+++ b/dynamo-angular/shared/components/generic-search-form/generic-search-form.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-import { Component,  Input, OnInit, } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import {
   AttributeModelResponse,
   CascadeModel,
@@ -165,28 +165,30 @@ export class GenericSearchFormComponent
    */
   override bindBeforeSearch() {
     this.searchObject = {};
-    this.attributeModels.filter(am => this.isSearchable(am)).forEach((am) => {
-      let control = this.mainForm!.get(am.name);
-      if (!this.isBoolean(am) && control && control.value) {
-        this.searchObject[am.name] = control.value;
-      }
-
-      if (this.isBoolean(am) && control) {
-        if (control.value === true || control.value === false) {
+    this.attributeModels
+      .filter((am) => this.isSearchable(am))
+      .forEach((am) => {
+        let control = this.mainForm!.get(am.name);
+        if (!this.isBoolean(am) && control && control.value) {
           this.searchObject[am.name] = control.value;
         }
-      }
 
-      let controlFrom = this.mainForm?.get(this.getFromName(am));
-      if (controlFrom && controlFrom.value) {
-        this.searchObject[this.getFromName(am)] = controlFrom.value;
-      }
+        if (this.isBoolean(am) && control) {
+          if (control.value === true || control.value === false) {
+            this.searchObject[am.name] = control.value;
+          }
+        }
 
-      let controlTo = this.mainForm?.get(this.getToName(am));
-      if (controlTo && controlTo.value) {
-        this.searchObject[this.getToName(am)] = controlTo.value;
-      }
-    });
+        let controlFrom = this.mainForm?.get(this.getFromName(am));
+        if (controlFrom && controlFrom.value) {
+          this.searchObject[this.getFromName(am)] = controlFrom.value;
+        }
+
+        let controlTo = this.mainForm?.get(this.getToName(am));
+        if (controlTo && controlTo.value) {
+          this.searchObject[this.getToName(am)] = controlTo.value;
+        }
+      });
   }
 
   /**
@@ -240,9 +242,9 @@ export class GenericSearchFormComponent
     let state = this.stateService.retrieveState(this.getStateKey());
     if (state) {
       this.attributeModels.forEach((am) => {
-        this.restoreStateValue(am.name, state)
-        this.restoreStateValue(this.getFromName(am), state)
-        this.restoreStateValue(this.getToName(am), state)
+        this.restoreStateValue(am.name, state);
+        this.restoreStateValue(this.getFromName(am), state);
+        this.restoreStateValue(this.getToName(am), state);
       });
     }
   }
@@ -277,5 +279,4 @@ export class GenericSearchFormComponent
     this.advancedMode = false;
     this.filterSearchModels(this.entityModel!);
   }
-
 }
diff --git a/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.html b/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.html
index 5a0954715..c4df0c685 100644
--- a/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.html
+++ b/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -81,6 +81,7 @@ <h4>{{ tableCaptionPlural }}</h4>
       [exportModeReference]="exportModeReference"
       [customValidatorTemplate]="customValidatorTemplate"
       [postProcessInputForm]="postProcessInputForm"
+      [modelActionEnabled]="modelActionEnabled"
       (onRowSelect)="rowClick($event)"
       (onSearchComplete)="searchComplete()"
     />
@@ -100,7 +101,7 @@ <h4>{{ tableCaptionPlural }}</h4>
         type="button"
         class="btn btn-primary m-1"
         (click)="callModelAction(vcr, action, undefined)"
-        [disabled]="loading"
+        [disabled]="loading || !isModelActionEnabled({}, action)"
       >
         <span class="pi {{ action.icon }}"></span>
         {{ action.displayNames[locale] }}
diff --git a/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.ts b/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.ts
index a18e51d84..38ad995bf 100644
--- a/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.ts
+++ b/dynamo-angular/shared/components/generic-search-layout/generic-search-layout.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,6 @@ import { AuthenticationService } from '../../service/authentication-service';
   styleUrls: ['./generic-search-layout.component.scss'],
 })
 export class GenericSearchLayoutComponent extends BaseCompositeCollectionComponent {
-
   // the key under which to store data in the state store key
   @Input() stateStoreKey?: string = undefined;
   // the IDs of the selected rows
@@ -87,13 +86,12 @@ export class GenericSearchLayoutComponent extends BaseCompositeCollectionCompone
   @Output() afterSearchFormBuilt: EventEmitter<any> =
     new EventEmitter<FormInfo>();
 
-    // nested table component
+  // nested table component
   @ViewChild(GenericTableComponent) table?: GenericTableComponent;
   //container for holding optional popup dialog
   @ViewChild('popupDialogContainerRef', { read: ViewContainerRef })
   vcr!: ViewContainerRef;
 
-
   defaultPageSize = 10;
   searchObject: any = {};
   tableCaptionPlural: string = '';
@@ -104,7 +102,7 @@ export class GenericSearchLayoutComponent extends BaseCompositeCollectionCompone
     entityModelService: ModelService,
     messageService: NotificationService,
     router: Router,
-    authService: AuthenticationService,
+    authService: AuthenticationService
   ) {
     super(service, entityModelService, messageService, router, authService);
   }
@@ -118,9 +116,10 @@ export class GenericSearchLayoutComponent extends BaseCompositeCollectionCompone
           this.tableCaptionPlural =
             this.entityModel.displayNamesPlural[this.locale];
         },
-        error: (error) => error?.error ?
-          this.messageService.error(error.error?.message) :
-          this.messageService.error("Unknown error")
+        error: (error) =>
+          error?.error
+            ? this.messageService.error(error.error?.message)
+            : this.messageService.error('Unknown error'),
       });
   }
 
@@ -185,7 +184,6 @@ export class GenericSearchLayoutComponent extends BaseCompositeCollectionCompone
   }
 
   override afterActionDialogClosed(): void {
-      this.search();
+    this.search();
   }
-
 }
diff --git a/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.html b/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.html
index a35fb1cc7..557d743d6 100644
--- a/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.html
+++ b/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.ts b/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.ts
index 1055614c0..be944ca98 100644
--- a/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.ts
+++ b/dynamo-angular/shared/components/generic-split-layout/generic-split-layout.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-split-layout/split-layout-mode.ts b/dynamo-angular/shared/components/generic-split-layout/split-layout-mode.ts
index b1b647cf5..6f37f01d3 100644
--- a/dynamo-angular/shared/components/generic-split-layout/split-layout-mode.ts
+++ b/dynamo-angular/shared/components/generic-split-layout/split-layout-mode.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/generic-table/generic-table.component.html b/dynamo-angular/shared/components/generic-table/generic-table.component.html
index 64d568b56..e39f7983a 100644
--- a/dynamo-angular/shared/components/generic-table/generic-table.component.html
+++ b/dynamo-angular/shared/components/generic-table/generic-table.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,7 +56,7 @@
         *ngFor="let action of filterEntityModelActions()"
         type="button"
         class="btn btn-primary m-1"
-        [disabled]="loading"
+        [disabled]="!isModelActionEnabled(row, action) || loading"
         (click)="callModelAction(vcr, action, row)"
         pTooltip="{{ action.displayNames[locale] }}"
       >
@@ -69,7 +69,7 @@
         [class]="action.buttonClass"
         (click)="callAdditionalRowAction(action, row)"
         pTooltip="{{ action.messageKey | translate }}"
-        [disabled]="isRowActionDisabled(action, row)"
+        [disabled]="isRowActionDisabled(action, row) || loading"
       >
         <span *ngIf="action.icon" class="pi {{ action.icon }}"></span>
       </button>
diff --git a/dynamo-angular/shared/components/generic-table/generic-table.component.ts b/dynamo-angular/shared/components/generic-table/generic-table.component.ts
index 81e690ee0..b2101d4ff 100644
--- a/dynamo-angular/shared/components/generic-table/generic-table.component.ts
+++ b/dynamo-angular/shared/components/generic-table/generic-table.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,9 +43,7 @@ import { NotificationService } from '../../service/notification-service';
 import { TableLazyLoadEvent } from 'primeng/table';
 import { decapitalize } from '../../functions/functions';
 import { finalize } from 'rxjs';
-import {
-  AdditionalRowAction,
-} from '../../model/additional-action';
+import { AdditionalRowAction } from '../../model/additional-action';
 import { EntityPopupDialogComponent } from '../entity-popup-dialog/entity-popup-dialog.component';
 import { CreateFilterService } from '../../service/create-filter.service';
 import { PopupButtonMode } from '../../model/popup-button-mode';
@@ -96,7 +94,6 @@ export class GenericTableComponent
   @Input() showDetailButton: boolean = false;
   // additional validation function to carry out before submitting the form
   @Input() additionalValidation?: (formGroup: FormGroup) => string | undefined;
-
   // event handler that is called when a user select a row
   @Output() onRowSelect: EventEmitter<any> = new EventEmitter();
   // event handler that is called after a search completes
@@ -187,12 +184,13 @@ export class GenericTableComponent
     componentRef.instance.additionalActions = this.additionalFormActions;
     componentRef.instance.postProcessInputForm = this.postProcessInputForm;
     componentRef.instance.additionalValidation = this.additionalValidation;
-    componentRef.instance.customValidatorTemplate = this.customValidatorTemplate;
-    componentRef.instance.injectedCustomInputs = this.injectedCustomInputs
+    componentRef.instance.customValidatorTemplate =
+      this.customValidatorTemplate;
+    componentRef.instance.injectedCustomInputs = this.injectedCustomInputs;
     componentRef.instance.injectedHiddenFieldService = this.hiddenFieldService;
     componentRef.instance.readOnly =
-      this.popupButtonMode === PopupButtonMode.READ_ONLY
-      || !this.isWriteAllowed();
+      this.popupButtonMode === PopupButtonMode.READ_ONLY ||
+      !this.isWriteAllowed();
 
     var callback = (obj: any): void => {
       this.search();
@@ -432,9 +430,11 @@ export class GenericTableComponent
   }
 
   override filterEntityModelActions() {
-    return this.entityModel?.actions?.filter(
-      (action) => action.type == EntityModelActionResponse.TypeEnum.UPDATE
-    ).filter(action => this.isActionAllowed(action))
+    return this.entityModel?.actions
+      ?.filter(
+        (action) => action.type == EntityModelActionResponse.TypeEnum.UPDATE
+      )
+      .filter((action) => this.isActionAllowed(action));
   }
 
   callAdditionalRowAction(action: AdditionalRowAction, row: any) {
@@ -472,7 +472,9 @@ export class GenericTableComponent
         this.entityName,
         this.exportMode,
         searchModel,
-        this.exportModeReference ? this.exportModeReference : this.entityModelReference,
+        this.exportModeReference
+          ? this.exportModeReference
+          : this.entityModelReference,
         this.locale,
         'response'
       )
@@ -494,7 +496,9 @@ export class GenericTableComponent
         this.entityName,
         this.exportMode,
         searchModel,
-        this.exportModeReference ? this.exportModeReference : this.entityModelReference,
+        this.exportModeReference
+          ? this.exportModeReference
+          : this.entityModelReference,
         this.locale,
         'response'
       )
diff --git a/dynamo-angular/shared/components/label/label.component.html b/dynamo-angular/shared/components/label/label.component.html
index 30482e86c..5cff09f34 100644
--- a/dynamo-angular/shared/components/label/label.component.html
+++ b/dynamo-angular/shared/components/label/label.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/label/label.component.ts b/dynamo-angular/shared/components/label/label.component.ts
index cd8854dd1..84094f05b 100644
--- a/dynamo-angular/shared/components/label/label.component.ts
+++ b/dynamo-angular/shared/components/label/label.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/lookup-field/lookup-field.component.html b/dynamo-angular/shared/components/lookup-field/lookup-field.component.html
index 673db34e1..d32d56939 100644
--- a/dynamo-angular/shared/components/lookup-field/lookup-field.component.html
+++ b/dynamo-angular/shared/components/lookup-field/lookup-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/lookup-field/lookup-field.component.ts b/dynamo-angular/shared/components/lookup-field/lookup-field.component.ts
index 62441ac2d..f4c538144 100644
--- a/dynamo-angular/shared/components/lookup-field/lookup-field.component.ts
+++ b/dynamo-angular/shared/components/lookup-field/lookup-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/number-field/number-field.component.html b/dynamo-angular/shared/components/number-field/number-field.component.html
index b79bd9015..7f414db23 100644
--- a/dynamo-angular/shared/components/number-field/number-field.component.html
+++ b/dynamo-angular/shared/components/number-field/number-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/number-field/number-field.component.ts b/dynamo-angular/shared/components/number-field/number-field.component.ts
index b181daf91..ffa3d63ac 100644
--- a/dynamo-angular/shared/components/number-field/number-field.component.ts
+++ b/dynamo-angular/shared/components/number-field/number-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.html b/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.html
index bcee4a9c8..7ca1b23a6 100644
--- a/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.html
+++ b/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.ts b/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.ts
index d7ac301d2..8e21f0c88 100644
--- a/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.ts
+++ b/dynamo-angular/shared/components/pdf-viewer-dialog/pdf-viewer-dialog.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.html b/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.html
index 8809704fb..dfcb8be03 100644
--- a/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.html
+++ b/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.ts b/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.ts
index ed64a7dbf..48332caca 100644
--- a/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.ts
+++ b/dynamo-angular/shared/components/pdf-viewer/pdf-viewer.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/select-entity/select-entity.component.html b/dynamo-angular/shared/components/select-entity/select-entity.component.html
index 22b7c5636..8b9cf9a01 100644
--- a/dynamo-angular/shared/components/select-entity/select-entity.component.html
+++ b/dynamo-angular/shared/components/select-entity/select-entity.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/select-entity/select-entity.component.ts b/dynamo-angular/shared/components/select-entity/select-entity.component.ts
index aee8dec29..7e700ca20 100644
--- a/dynamo-angular/shared/components/select-entity/select-entity.component.ts
+++ b/dynamo-angular/shared/components/select-entity/select-entity.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/select-many/select-many.component.html b/dynamo-angular/shared/components/select-many/select-many.component.html
index db081d40a..2f3071f26 100644
--- a/dynamo-angular/shared/components/select-many/select-many.component.html
+++ b/dynamo-angular/shared/components/select-many/select-many.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/select-many/select-many.component.ts b/dynamo-angular/shared/components/select-many/select-many.component.ts
index 3cc2b7bb4..ed7be5f3c 100644
--- a/dynamo-angular/shared/components/select-many/select-many.component.ts
+++ b/dynamo-angular/shared/components/select-many/select-many.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/string-field/string-field.component.html b/dynamo-angular/shared/components/string-field/string-field.component.html
index 7738f268d..3a0a09460 100644
--- a/dynamo-angular/shared/components/string-field/string-field.component.html
+++ b/dynamo-angular/shared/components/string-field/string-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/string-field/string-field.component.ts b/dynamo-angular/shared/components/string-field/string-field.component.ts
index 42b6b0691..8e21c2ee9 100644
--- a/dynamo-angular/shared/components/string-field/string-field.component.ts
+++ b/dynamo-angular/shared/components/string-field/string-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/time-field/time-field.component.html b/dynamo-angular/shared/components/time-field/time-field.component.html
index 152118c93..a01dc1a4d 100644
--- a/dynamo-angular/shared/components/time-field/time-field.component.html
+++ b/dynamo-angular/shared/components/time-field/time-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/time-field/time-field.component.ts b/dynamo-angular/shared/components/time-field/time-field.component.ts
index 4507c54c0..358b90c07 100644
--- a/dynamo-angular/shared/components/time-field/time-field.component.ts
+++ b/dynamo-angular/shared/components/time-field/time-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.html b/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.html
index cb22326d1..2404a4453 100644
--- a/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.html
+++ b/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.html
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.ts b/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.ts
index fa8b7de5c..edcef7be0 100644
--- a/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.ts
+++ b/dynamo-angular/shared/components/timestamp-field/timestamp-field.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/directives/additional-validation-directive.ts b/dynamo-angular/shared/directives/additional-validation-directive.ts
index daf357020..9f6004802 100644
--- a/dynamo-angular/shared/directives/additional-validation-directive.ts
+++ b/dynamo-angular/shared/directives/additional-validation-directive.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/directives/hidden-field-directive.ts b/dynamo-angular/shared/directives/hidden-field-directive.ts
index 5cb2e8b77..8d6dd8414 100644
--- a/dynamo-angular/shared/directives/hidden-field-directive.ts
+++ b/dynamo-angular/shared/directives/hidden-field-directive.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/directives/override-field-directive.ts b/dynamo-angular/shared/directives/override-field-directive.ts
index 658b9d782..1467ef1ed 100644
--- a/dynamo-angular/shared/directives/override-field-directive.ts
+++ b/dynamo-angular/shared/directives/override-field-directive.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/functions/entitymodel-functions.ts b/dynamo-angular/shared/functions/entitymodel-functions.ts
index bb8143835..a7297b275 100644
--- a/dynamo-angular/shared/functions/entitymodel-functions.ts
+++ b/dynamo-angular/shared/functions/entitymodel-functions.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/functions/functions.ts b/dynamo-angular/shared/functions/functions.ts
index bb183e17a..b678db981 100644
--- a/dynamo-angular/shared/functions/functions.ts
+++ b/dynamo-angular/shared/functions/functions.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/guards/backend-available-guard.ts b/dynamo-angular/shared/guards/backend-available-guard.ts
index 6afefd865..739c8c2e4 100644
--- a/dynamo-angular/shared/guards/backend-available-guard.ts
+++ b/dynamo-angular/shared/guards/backend-available-guard.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/guards/role-guard.ts b/dynamo-angular/shared/guards/role-guard.ts
index bd3a2a7e3..c238a5a53 100644
--- a/dynamo-angular/shared/guards/role-guard.ts
+++ b/dynamo-angular/shared/guards/role-guard.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/access-token.ts b/dynamo-angular/shared/model/access-token.ts
index 026f64ba2..1f103edeb 100644
--- a/dynamo-angular/shared/model/access-token.ts
+++ b/dynamo-angular/shared/model/access-token.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/additional-action-mode.ts b/dynamo-angular/shared/model/additional-action-mode.ts
index bbc0599b0..1200b867a 100644
--- a/dynamo-angular/shared/model/additional-action-mode.ts
+++ b/dynamo-angular/shared/model/additional-action-mode.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/additional-action.ts b/dynamo-angular/shared/model/additional-action.ts
index 7411cbebd..987acd8fd 100644
--- a/dynamo-angular/shared/model/additional-action.ts
+++ b/dynamo-angular/shared/model/additional-action.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/attribute-group-mode.ts b/dynamo-angular/shared/model/attribute-group-mode.ts
index 2c48f6699..177a3a3cb 100644
--- a/dynamo-angular/shared/model/attribute-group-mode.ts
+++ b/dynamo-angular/shared/model/attribute-group-mode.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/file-clear-info.ts b/dynamo-angular/shared/model/file-clear-info.ts
index 8060e8020..e7a71d2c1 100644
--- a/dynamo-angular/shared/model/file-clear-info.ts
+++ b/dynamo-angular/shared/model/file-clear-info.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/file-upload-info.ts b/dynamo-angular/shared/model/file-upload-info.ts
index 1d7b3660d..1d16df3bf 100644
--- a/dynamo-angular/shared/model/file-upload-info.ts
+++ b/dynamo-angular/shared/model/file-upload-info.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/form-info.ts b/dynamo-angular/shared/model/form-info.ts
index 2e662cda5..a8adf3c8c 100644
--- a/dynamo-angular/shared/model/form-info.ts
+++ b/dynamo-angular/shared/model/form-info.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/param.ts b/dynamo-angular/shared/model/param.ts
index 2f81794ca..ce11f52d2 100644
--- a/dynamo-angular/shared/model/param.ts
+++ b/dynamo-angular/shared/model/param.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/pdf-viewer.mode.ts b/dynamo-angular/shared/model/pdf-viewer.mode.ts
index 716feb8e5..db7d4413b 100644
--- a/dynamo-angular/shared/model/pdf-viewer.mode.ts
+++ b/dynamo-angular/shared/model/pdf-viewer.mode.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/popup-button-mode.ts b/dynamo-angular/shared/model/popup-button-mode.ts
index adca1167d..8c7e6c609 100644
--- a/dynamo-angular/shared/model/popup-button-mode.ts
+++ b/dynamo-angular/shared/model/popup-button-mode.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/search-form-mode.ts b/dynamo-angular/shared/model/search-form-mode.ts
index b030fc376..70e9248a8 100644
--- a/dynamo-angular/shared/model/search-form-mode.ts
+++ b/dynamo-angular/shared/model/search-form-mode.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/select-option.ts b/dynamo-angular/shared/model/select-option.ts
index 9f4a849c8..96b06d977 100644
--- a/dynamo-angular/shared/model/select-option.ts
+++ b/dynamo-angular/shared/model/select-option.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/service-info.ts b/dynamo-angular/shared/model/service-info.ts
index 51799a890..0b20e4cb2 100644
--- a/dynamo-angular/shared/model/service-info.ts
+++ b/dynamo-angular/shared/model/service-info.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/model/variables.ts b/dynamo-angular/shared/model/variables.ts
index 6ee07a8e2..b4806e269 100644
--- a/dynamo-angular/shared/model/variables.ts
+++ b/dynamo-angular/shared/model/variables.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/pipes/enum-pipe.ts b/dynamo-angular/shared/pipes/enum-pipe.ts
index 8fa3b8444..7805f156e 100644
--- a/dynamo-angular/shared/pipes/enum-pipe.ts
+++ b/dynamo-angular/shared/pipes/enum-pipe.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/pipes/lookup-entity-pipe.ts b/dynamo-angular/shared/pipes/lookup-entity-pipe.ts
index 23bdad76d..68721c382 100644
--- a/dynamo-angular/shared/pipes/lookup-entity-pipe.ts
+++ b/dynamo-angular/shared/pipes/lookup-entity-pipe.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/pipes/translate-boolean-pipe.ts b/dynamo-angular/shared/pipes/translate-boolean-pipe.ts
index e69107360..003825f63 100644
--- a/dynamo-angular/shared/pipes/translate-boolean-pipe.ts
+++ b/dynamo-angular/shared/pipes/translate-boolean-pipe.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/pipes/translate-entity-pipe.ts b/dynamo-angular/shared/pipes/translate-entity-pipe.ts
index 1f2f4cc65..768770ad3 100644
--- a/dynamo-angular/shared/pipes/translate-entity-pipe.ts
+++ b/dynamo-angular/shared/pipes/translate-entity-pipe.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/pipes/truncate-pipe.ts b/dynamo-angular/shared/pipes/truncate-pipe.ts
index 587a442b9..584a19067 100644
--- a/dynamo-angular/shared/pipes/truncate-pipe.ts
+++ b/dynamo-angular/shared/pipes/truncate-pipe.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/prime-ng.module.ts b/dynamo-angular/shared/prime-ng.module.ts
index 19aa4d3f5..5492bc370 100644
--- a/dynamo-angular/shared/prime-ng.module.ts
+++ b/dynamo-angular/shared/prime-ng.module.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/authentication-service.ts b/dynamo-angular/shared/service/authentication-service.ts
index 5ef3e751a..b35e39b00 100644
--- a/dynamo-angular/shared/service/authentication-service.ts
+++ b/dynamo-angular/shared/service/authentication-service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/binding-service.ts b/dynamo-angular/shared/service/binding-service.ts
index 905778549..df85cd153 100644
--- a/dynamo-angular/shared/service/binding-service.ts
+++ b/dynamo-angular/shared/service/binding-service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/confirm.service.ts b/dynamo-angular/shared/service/confirm.service.ts
index 79e11f60a..185ab9dc4 100644
--- a/dynamo-angular/shared/service/confirm.service.ts
+++ b/dynamo-angular/shared/service/confirm.service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/create-filter.service.ts b/dynamo-angular/shared/service/create-filter.service.ts
index 4f19eb76e..1793fabe2 100644
--- a/dynamo-angular/shared/service/create-filter.service.ts
+++ b/dynamo-angular/shared/service/create-filter.service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/hidden-field-service.ts b/dynamo-angular/shared/service/hidden-field-service.ts
index d0c10a2be..b1431200e 100644
--- a/dynamo-angular/shared/service/hidden-field-service.ts
+++ b/dynamo-angular/shared/service/hidden-field-service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/notification-service.ts b/dynamo-angular/shared/service/notification-service.ts
index 28b3e2cfe..bd06a40e3 100644
--- a/dynamo-angular/shared/service/notification-service.ts
+++ b/dynamo-angular/shared/service/notification-service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/service/search-form-state.service.ts b/dynamo-angular/shared/service/search-form-state.service.ts
index 6ba339722..4080957d5 100644
--- a/dynamo-angular/shared/service/search-form-state.service.ts
+++ b/dynamo-angular/shared/service/search-form-state.service.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/shared.module.ts b/dynamo-angular/shared/shared.module.ts
index d5c00ab8d..324683f7c 100644
--- a/dynamo-angular/shared/shared.module.ts
+++ b/dynamo-angular/shared/shared.module.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-angular/shared/validators/validators.ts b/dynamo-angular/shared/validators/validators.ts
index fd2d51ff8..5da71dd14 100644
--- a/dynamo-angular/shared/validators/validators.ts
+++ b/dynamo-angular/shared/validators/validators.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-api/src/main/java/org/dynamoframework/domain/model/ActionFormMode.java b/dynamo-api/src/main/java/org/dynamoframework/domain/model/ActionFormMode.java
index 7852b06c4..bae434166 100644
--- a/dynamo-api/src/main/java/org/dynamoframework/domain/model/ActionFormMode.java
+++ b/dynamo-api/src/main/java/org/dynamoframework/domain/model/ActionFormMode.java
@@ -4,7 +4,7 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dynamo-api/src/site/site.xml b/dynamo-api/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-api/src/site/site.xml
+++ b/dynamo-api/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-export/src/site/site.xml b/dynamo-export/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-export/src/site/site.xml
+++ b/dynamo-export/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-formfill/src/site/site.xml b/dynamo-formfill/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-formfill/src/site/site.xml
+++ b/dynamo-formfill/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-functional-domain/src/site/site.xml b/dynamo-functional-domain/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-functional-domain/src/site/site.xml
+++ b/dynamo-functional-domain/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-functional-domain/src/test/resources/META-INF/orm.xml b/dynamo-functional-domain/src/test/resources/META-INF/orm.xml
index b0931c207..f1c109a3a 100644
--- a/dynamo-functional-domain/src/test/resources/META-INF/orm.xml
+++ b/dynamo-functional-domain/src/test/resources/META-INF/orm.xml
@@ -8,9 +8,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-impl/src/site/site.xml b/dynamo-impl/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-impl/src/site/site.xml
+++ b/dynamo-impl/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-impl/src/test/java/org/dynamoframework/service/impl/EntityScannerTest.java b/dynamo-impl/src/test/java/org/dynamoframework/service/impl/EntityScannerTest.java
index 58d53c368..c8c1b48b3 100644
--- a/dynamo-impl/src/test/java/org/dynamoframework/service/impl/EntityScannerTest.java
+++ b/dynamo-impl/src/test/java/org/dynamoframework/service/impl/EntityScannerTest.java
@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-impl/src/test/java/org/dynamoframework/utils/ClassUtilsTest.java b/dynamo-impl/src/test/java/org/dynamoframework/utils/ClassUtilsTest.java
index 59c85ed58..05e875dc6 100644
--- a/dynamo-impl/src/test/java/org/dynamoframework/utils/ClassUtilsTest.java
+++ b/dynamo-impl/src/test/java/org/dynamoframework/utils/ClassUtilsTest.java
@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-impl/src/test/resources/META-INF/entitymodel.properties b/dynamo-impl/src/test/resources/META-INF/entitymodel.properties
index 731aac18a..fe37b8d6f 100644
--- a/dynamo-impl/src/test/resources/META-INF/entitymodel.properties
+++ b/dynamo-impl/src/test/resources/META-INF/entitymodel.properties
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-impl/src/test/resources/application.properties b/dynamo-impl/src/test/resources/application.properties
index 59a02d9a8..3751fbc44 100644
--- a/dynamo-impl/src/test/resources/application.properties
+++ b/dynamo-impl/src/test/resources/application.properties
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-integration-camel/src/site/site.xml b/dynamo-integration-camel/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-integration-camel/src/site/site.xml
+++ b/dynamo-integration-camel/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-integration-import/src/site/site.xml b/dynamo-integration-import/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-integration-import/src/site/site.xml
+++ b/dynamo-integration-import/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-rest/src/main/java/org/dynamoframework/rest/FileController.java b/dynamo-rest/src/main/java/org/dynamoframework/rest/FileController.java
index 1762b9074..62404ff35 100644
--- a/dynamo-rest/src/main/java/org/dynamoframework/rest/FileController.java
+++ b/dynamo-rest/src/main/java/org/dynamoframework/rest/FileController.java
@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-rest/src/site/site.xml b/dynamo-rest/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-rest/src/site/site.xml
+++ b/dynamo-rest/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/dynamo-test/src/site/site.xml b/dynamo-test/src/site/site.xml
index d491e51b4..634643981 100644
--- a/dynamo-test/src/site/site.xml
+++ b/dynamo-test/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/pom.xml b/pom.xml
index 903629d53..502ae0238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <description>Dynamo Web Application Accelerator is a development framework that aims to increase productivity.</description>
     <url>https://www.dynamoframework.org</url>
     <organization>
-        <name>Open Circle Solutions BV</name>
+        <name>Open Circle Solutions</name>
         <url>https://www.opencirclesolutions.nl</url>
     </organization>
     <inceptionYear>2014</inceptionYear>
diff --git a/src/docs/asciidoc/css/ocs.css b/src/docs/asciidoc/css/ocs.css
index d87a7a9cc..4e8375879 100644
--- a/src/docs/asciidoc/css/ocs.css
+++ b/src/docs/asciidoc/css/ocs.css
@@ -2,7 +2,7 @@
  * #%L
  * Dynamo Framework
  * %%
- * Copyright (C) 2014 - 2024 Open Circle Solutions BV
+ * Copyright (C) 2014 - 2024 Open Circle Solutions
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/docs/asciidoc/media/logo-opencirclesolutions.svg b/src/docs/asciidoc/media/logo-opencirclesolutions.svg
index ef13b20b9..2ca936503 100755
--- a/src/docs/asciidoc/media/logo-opencirclesolutions.svg
+++ b/src/docs/asciidoc/media/logo-opencirclesolutions.svg
@@ -8,9 +8,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/src/site/site.xml b/src/site/site.xml
index b48e65a51..59ffde49e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.