diff --git a/libs/shared/src/lib/components/ui/aggregation-builder/aggregation-builder.component.ts b/libs/shared/src/lib/components/ui/aggregation-builder/aggregation-builder.component.ts
index 50eb4fd42f..16dc7dca5e 100644
--- a/libs/shared/src/lib/components/ui/aggregation-builder/aggregation-builder.component.ts
+++ b/libs/shared/src/lib/components/ui/aggregation-builder/aggregation-builder.component.ts
@@ -32,7 +32,7 @@ export class AggregationBuilderComponent
 
   // === FIELDS ===
   private fields = new BehaviorSubject<any[]>([]);
-  public fields$!: Observable<any[]>;
+  public fields$ = this.fields.asObservable();
   private selectedFields = new BehaviorSubject<any[]>([]);
   public selectedFields$!: Observable<any[]>;
   private metaFields = new BehaviorSubject<any[]>([]);
@@ -63,10 +63,16 @@ export class AggregationBuilderComponent
   }
 
   ngOnInit(): void {
-    this.initFields();
+    // Fixes issue where sometimes we try to load the fields before the queries are loaded
+    this.queryBuilder.availableQueries$
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((queryList) => {
+        if (queryList.length > 0) {
+          this.initFields();
+        }
+      });
 
     // Fields query
-    this.fields$ = this.fields.asObservable();
     this.fields$.pipe(takeUntil(this.destroy$)).subscribe((fields) => {
       fields.forEach((field) => {
         field['used'] = this.pipelineForm.value.some((x: any) => {
diff --git a/libs/shared/src/lib/components/widgets/map-settings/edit-layer-modal/layer-datasource/layer-datasource.component.ts b/libs/shared/src/lib/components/widgets/map-settings/edit-layer-modal/layer-datasource/layer-datasource.component.ts
index 842c72fd3a..34da03c413 100644
--- a/libs/shared/src/lib/components/widgets/map-settings/edit-layer-modal/layer-datasource/layer-datasource.component.ts
+++ b/libs/shared/src/lib/components/widgets/map-settings/edit-layer-modal/layer-datasource/layer-datasource.component.ts
@@ -394,7 +394,7 @@ export class LayerDatasourceComponent
       .map((field) => {
         return {
           label: field.name,
-          name: field.graphQLFieldName,
+          name: field.name,
           type: field.type,
         } as Fields;
       });