diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go
index e22bfef7e..684f8e593 100644
--- a/apier/v1/apier2_it_test.go
+++ b/apier/v1/apier2_it_test.go
@@ -46,7 +46,7 @@ var (
 		testAPIerInitCfg,
 		testAPIerInitDataDb,
 		testAPIerResetStorDb,
-		//testAPIerStartEngine,
+		testAPIerStartEngine,
 		testAPIerRPCConn,
 		testAPIerLoadFromFolder,
 		testAPIerGetRatingPlanCost,
@@ -58,14 +58,14 @@ var (
 		testAPIerRemoveTPFromFolder,
 		testAPIerAfterDelete,
 		testAPIerVerifyAttributesAfterDelete,
-		//testAPIerKillEngine,
+		testAPIerKillEngine,
 
-		/* testAPIerInitDataDb,
+		testAPIerInitDataDb,
 		testAPIerResetStorDb,
 		testAPIerStartEngineSleep,
 		testAPIerRPCConn,
 		testApierSetAndRemoveRatingProfileAnySubject,
-		testAPIerKillEngine, */
+		testAPIerKillEngine,
 	}
 )
 
diff --git a/engine/datamanager.go b/engine/datamanager.go
index dd1dd5c05..8c993d454 100644
--- a/engine/datamanager.go
+++ b/engine/datamanager.go
@@ -2270,6 +2270,7 @@ func (dm *DataManager) RemoveChargerProfile(tenant, id string,
 			tenant).RemoveItemFromIndex(tenant, id, oldCpp.FilterIDs); err != nil {
 			return
 		}
+
 		if err = removeReverseFilterIndexForFilter(dm, utils.CacheChargerFilterIndexes,
 			oldCpp.Tenant, oldCpp.ID, oldCpp.FilterIDs); err != nil {
 			return
diff --git a/engine/libindex.go b/engine/libindex.go
index 95f3b9496..581d9e01f 100644
--- a/engine/libindex.go
+++ b/engine/libindex.go
@@ -324,6 +324,7 @@ func removeReverseFilterIndexForFilter(dm *DataManager, idxItmType, tnt, itemID
 			err = nil
 			continue // already removed
 		}
+
 		delete(indexes[idxItmType], itemID) // delete index from map
 
 		indexerKey := utils.ConcatenatedKey(tnt, fltrID)
diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go
index 32ece3f17..117cd270a 100644
--- a/engine/storage_internal_datadb.go
+++ b/engine/storage_internal_datadb.go
@@ -985,12 +985,6 @@ func (iDB *InternalDB) SetFilterIndexesDrv(cacheID, tntCtx string,
 				true, utils.NonTransactional)
 			continue
 		}
-		//to be the same as HMSET
-		if x, ok := iDB.db.Get(cacheID, dbKey); ok && x != nil {
-			for key := range x.(utils.StringMap) {
-				indx[key] = true
-			}
-		}
 		iDB.db.Set(cacheID, dbKey, indx, []string{tntCtx},
 			true, utils.NonTransactional)
 	}