diff --git a/angular.json b/angular.json
index b0a9370..88bf69e 100644
--- a/angular.json
+++ b/angular.json
@@ -22,15 +22,13 @@
             ],
             "styles": [
               "src/styles.css",
-              "src/material.scss",
-              "node_modules/datatables.net-dt/css/jquery.dataTables.css"
+              "src/material.scss"
             ],
             "scripts": [
               "src/assets/common-assets/common/jquery.js",
               "src/assets/common-assets/common/uikit.min.js",
               "src/assets/common-assets/common/uikit-icons.min.js",
-              "node_modules/jquery/dist/jquery.js",
-              "node_modules/datatables.net/js/jquery.dataTables.js"
+              "node_modules/jquery/dist/jquery.js"
             ]
           },
           "configurations": {
@@ -126,8 +124,7 @@
               "node_modules/jquery/dist/jquery.js"
             ],
             "styles": [
-              "src/styles.css",
-              "node_modules/datatables.net-dt/css/jquery.dataTables.css"
+              "src/styles.css"
             ],
             "assets": [
               "src/assets",
diff --git a/package.json b/package.json
index 4d8790f..e3b98b6 100644
--- a/package.json
+++ b/package.json
@@ -48,11 +48,8 @@
     "@nguniversal/express-engine": "^6.0.0",
     "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
     "@types/express": "^4.16.1",
-    "angular-datatables": "^4.4.1",
     "clipboard": "^1.5.16",
     "core-js": "^2.4.1",
-    "datatables.net": "^1.10.19",
-    "datatables.net-dt": "^1.10.19",
     "jquery": "^3.4.1",
     "ng-recaptcha": "^3.0.5",
     "ng2-ckeditor": "1.1.9",
@@ -68,7 +65,6 @@
     "@angular/cli": "^7.3.9",
     "@angular/compiler-cli": "7.2.14",
     "@angular/language-service": "7.2.14",
-    "@types/datatables.net": "^1.10.17",
     "@types/jquery": "^3.3.29",
     "@types/node": "^8.0.30",
     "cpy-cli": "^1.0.1",
diff --git a/src/app/utils/indicator-utils.ts b/src/app/utils/indicator-utils.ts
index 048683b..4eaca74 100644
--- a/src/app/utils/indicator-utils.ts
+++ b/src/app/utils/indicator-utils.ts
@@ -379,7 +379,7 @@ export class IndicatorUtils {
     if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) {
       replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName))
     }
-
+  //Check  apply enhancements return this.applySchemaEnhancements( ..);
     return (indicatorPath.chartObject?indicatorPath.url + encodeURIComponent(replacedUrl):replacedUrl);
 
   }
@@ -928,7 +928,7 @@ export class IndicatorUtils {
     if(url.split('json=').length > 1) {
       let obj = JSON.parse(decodeURIComponent(url.split('json=')[1]));
       for (let query of this.getQueryObjectName(obj)?obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]:obj[this.getDescriptionObjectName(obj)]) {
-        if (!query["query"]["profile"] ||query["query"]["profile"] != 'monitor') {
+        if (!query["query"]["profile"] || query["query"]["profile"] == 'OpenAIRE All-inclusive' ||  query["query"]["profile"] == 'OpenAIRE original') {
           changes += (query["query"]["profile"] ? ( "Changed profile \"" + query["query"]["profile"] + "\" to " ):"Added profile ") + " \"monitor\"";
           query["query"]["profile"] = 'monitor';
         }