diff --git a/apier/v1/filter_indexes.go b/apier/v1/filter_indexes.go
index 848c1472a..8e9fa3a29 100644
--- a/apier/v1/filter_indexes.go
+++ b/apier/v1/filter_indexes.go
@@ -103,7 +103,7 @@ func (apierSv1 *APIerSv1) GetFilterIndexes(arg *AttrGetFilterIndexes, reply *[]s
 	if tnt == utils.EmptyString {
 		tnt = apierSv1.Config.GeneralCfg().DefaultTenant
 	}
-	tntCtx := arg.Tenant
+	tntCtx := tnt
 	switch arg.ItemType {
 	case utils.MetaThresholds:
 		arg.ItemType = utils.CacheThresholdFilterIndexes
diff --git a/engine/libindex_health.go b/engine/libindex_health.go
index a62cb9978..7cc9def50 100644
--- a/engine/libindex_health.go
+++ b/engine/libindex_health.go
@@ -581,7 +581,7 @@ func GetFltrIdxHealth(dm *DataManager, fltrCache, fltrIdxCache, objCache *ltcach
 				err = nil
 				continue
 			}
-			if ctx != nil ||
+			if ctx != nil &&
 				(obj.contexts == nil || !utils.IsSliceMember(*obj.contexts, *ctx)) { // check the contexts if present
 				key := utils.ConcatenatedKey(tntCtx, idxKey)
 				rply.MissingIndexes[key] = append(rply.MissingIndexes[key], itmID)
diff --git a/utils/consts.go b/utils/consts.go
index f8287541d..8a6d74637 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -1280,7 +1280,11 @@ const (
 	APIerSv1ComputeFilterIndexIDs             = "APIerSv1.ComputeFilterIndexIDs"
 	APIerSv1GetAccountActionPlansIndexHealth  = "APIerSv1.GetAccountActionPlansIndexHealth"
 	APIerSv1GetReverseDestinationsIndexHealth = "APIerSv1.GetReverseDestinationsIndexHealth"
-	APIerSv1GetThresholdsIndexesHealth = "APIerSv1.GetThresholdsIndexesHealth"
+	APIerSv1GetThresholdsIndexesHealth        = "APIerSv1.GetThresholdsIndexesHealth"
+	APIerSv1GetResourcesIndexesHealth         = "APIerSv1.GetResourcesIndexesHealth"
+	APIerSv1GetStatsIndexesHealth             = "APIerSv1.GetStatsIndexesHealth"
+	APIerSv1GetRoutesIndexesHealth            = "APIerSv1.GetRoutesIndexesHealth"
+	APIerSv1GetChargersIndexesHealth          = "APIerSv1.GetChargersIndexesHealth"
 	APIerSv1Ping                              = "APIerSv1.Ping"
 	APIerSv1SetDispatcherProfile              = "APIerSv1.SetDispatcherProfile"
 	APIerSv1GetDispatcherProfile              = "APIerSv1.GetDispatcherProfile"