diff --git a/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.component.ts b/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.component.ts
index 942d612a67..bfa66e2cad 100644
--- a/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.component.ts
+++ b/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.component.ts
@@ -62,6 +62,7 @@ export interface GroupDescriptor {
   id:string;
   members:FieldDescriptor[];
   query?:QueryResource;
+  isolated:boolean;
   type:string;
 }
 
@@ -275,7 +276,8 @@ export class WorkPackageSingleViewComponent implements OnInit, OnDestroy {
           name: group.name,
           id: groupId || randomString(16),
           members: this.getFields(resource, group.attributes),
-          type: group._type
+          type: group._type,
+          isolated: false
         };
       } else {
         return {
@@ -284,7 +286,8 @@ export class WorkPackageSingleViewComponent implements OnInit, OnDestroy {
           query: group._embedded.query,
           relationType: group.relationType,
           members: [group._embedded.query],
-          type: group._type
+          type: group._type,
+          isolated: true
         };
       }
     });
diff --git a/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.html b/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.html
index 263c9e3216..22c30d318e 100644
--- a/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.html
+++ b/frontend/src/app/components/work-packages/wp-single-view/wp-single-view.html
@@ -109,14 +109,20 @@
       </div>
     </div>
 
-    <ng-container wp-isolated-query-space>
+    <ng-container wp-isolated-query-space *ngIf="group.isolated">
       <ndc-dynamic [ndcDynamicComponent]="attributeGroupComponent(group)"
-                   [ndcDynamicInjector]="injector"
                    [ndcDynamicInputs]="{ workPackage: workPackage,
                                          group: group,
                                          query: group.query }" >
       </ndc-dynamic>
     </ng-container>
+
+    <ng-container *ngIf="!group.isolated">
+      <ndc-dynamic [ndcDynamicComponent]="attributeGroupComponent(group)"
+                   [ndcDynamicInjector]="injector"
+                   [ndcDynamicInputs]="{ workPackage: workPackage, group: group }">
+      </ndc-dynamic>
+    </ng-container>
   </div>
 </div>