diff --git a/package-lock.json b/package-lock.json
index e1c1522bf18efcf63de5c7480a902bedf266ea44..a2fbf3937d9ad700d7f101e8cd946dec909ad6a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "webapp",
-  "version": "2.6.13",
+  "version": "2.7.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d5992de37d79142e0cba69a13735b7ecd54fc0dd..8ca691004d985989b9b500d8443e99da410b15e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webapp",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "license": "GNU Affero General Public License v3.0",
   "scripts": {
     "ng": "ng",
diff --git a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts
index 541742cf48bbf42676c3782890e28b8ac0e48619..464f063e4c748212e16cca1d8de107f79adab3a9 100644
--- a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts
+++ b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts
@@ -160,7 +160,7 @@ export class ResourceQueryableComponent implements OnInit {
       this.initInseeLabel(this._datasetDetailService.datasetData);
     }
     else {
-      this._datasetDetailService.retrieveDatasetData().subscribe(() => {
+      this._datasetDetailService.sampleDataLoaded$.subscribe((data) => {
         this.initInseeLabel(this._datasetDetailService.datasetData);
       });
     }
diff --git a/src/app/dataset-detail/components/dataset-detail/dataset-detail.component.ts b/src/app/dataset-detail/components/dataset-detail/dataset-detail.component.ts
index 711d7b1b179b51978fc8e169d217e4e410ab3a68..a2a0879a6c92e161ecf7aba1cd03ce7ea98aca6c 100644
--- a/src/app/dataset-detail/components/dataset-detail/dataset-detail.component.ts
+++ b/src/app/dataset-detail/components/dataset-detail/dataset-detail.component.ts
@@ -60,6 +60,8 @@ export class DatasetDetailComponent implements OnInit, OnDestroy {
       this.isLoading = true;
       this.initDatasetInfo();
     });
+
+    this._datasetDetailService.retrieveDatasetData().subscribe();
   }
 
   ngOnDestroy() {
diff --git a/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts b/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts
index 9ca821854a592ebe7a2e633c4802d20bf6081572..289c3af093748265a3cfdc87e805f21849172e75 100644
--- a/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts
+++ b/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.ts
@@ -114,17 +114,27 @@ export class ResourceDownloadItemComponent implements OnInit {
         this.selectedProjection = this.projectionList[0];
       }
 
+
       // Set the insee property label for this dataset
       if (this._datasetDetailService.datasetData[0]) {
-        const properties = Object.keys(this._datasetDetailService.datasetData[0].properties);
-        this.inseeLabel = properties.find((prop) => { return prop.includes('insee'); });
+        this.setInseeProperties();
+      } else {
+        this._datasetDetailService.sampleDataLoaded$.subscribe((data) => {
+          this.setInseeProperties();
+        });
       }
-      this.communeInseeList.sort((a, b) => (a.commune > b.commune) ? 1 : -1);
 
       this.setProjection(this.selectedProjection);
     }
 
   }
+  setInseeProperties ()
+  {
+    const properties = Object.keys(this._datasetDetailService.datasetData[0].properties);
+    this.inseeLabel = properties.find((prop) => { return prop.includes('insee'); });
+
+    this.communeInseeList.sort((a, b) => (a.commune.localeCompare(b.commune)));
+  }
 
   getFormatName() {
     return this.format ? this.format.name : this.link.formats[0];
@@ -199,6 +209,7 @@ export class ResourceDownloadItemComponent implements OnInit {
   // Set the selected insee and set the queryable parameters
   // depending on the resource
   setInsee(insee) {
+
     this.selectedInsee = insee;
     if (!this.selectedInsee || !this.inseeLabel) {
       this.queryableParameters.insee = '';
diff --git a/src/app/dataset-detail/components/dataset-table-map/dataset-table-map.component.ts b/src/app/dataset-detail/components/dataset-table-map/dataset-table-map.component.ts
index 3cc5232ec24d95c829479f9ae4e75e184057262b..5d8a4bcbb87b669cb9fd2d7407948260542ad781 100644
--- a/src/app/dataset-detail/components/dataset-table-map/dataset-table-map.component.ts
+++ b/src/app/dataset-detail/components/dataset-table-map/dataset-table-map.component.ts
@@ -63,10 +63,15 @@ export class DatasetTableMapComponent implements OnInit, OnDestroy {
     this.searchInput.setValue(this._datasetDetailService.searchString);
 
     if (this.hasTable) {
-      // If dataset has table then preload some data for the table component
-      this._datasetDetailService.retrieveDatasetData().subscribe(() => {
+      if (this._datasetDetailService.datasetData){
         this.dataLoaded = true;
-      });
+      }
+      else {
+        // If dataset has table then preload some data for the table component
+        this._datasetDetailService.sampleDataLoaded$.subscribe((data) => {
+          this.dataLoaded = true;
+        }).unsubscribe();
+      }
     }
   }
 
diff --git a/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts b/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts
index c0580dfefb55ec7db9840d0ccf00dd415241fd2b..8f571dac8b8d29c22152d4f630c624bb418c2408 100644
--- a/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts
+++ b/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts
@@ -100,9 +100,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
     // Set the new sort value in the service
     this._datasetDetailService.sortBy(keyType);
     //  Retrieve date sorted with the new value
-    this._datasetDetailService.retrieveDatasetData().subscribe(() => {
-      this.tableWidthModified.emit(true);
-    });
+    this.getSearchResults();
   }
 
   getSearchResults() {