diff --git a/monitor-admin/utils/indicator-utils.ts b/monitor-admin/utils/indicator-utils.ts
index 299e9b61..9e19fe6c 100644
--- a/monitor-admin/utils/indicator-utils.ts
+++ b/monitor-admin/utils/indicator-utils.ts
@@ -872,7 +872,7 @@ export class IndicatorUtils {
           let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
           if(replacedValue) { // don't proceed in replacement if no replaced value matches
             if ((gfilter["field"].indexOf(".datasource.name") != -1 || gfilter["field"].indexOf(".HostedBy datasource") != -1)||
-              (gfilter["field"].indexOf(".datasource.id") != -1)) {
+              (gfilter["field"].indexOf(".datasource.id") != -1) || (gfilter["field"].indexOf(".hostedby") != -1)) {
               gfilter["values"][0] = replacedValue;
             }
           }