diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql
index 515c17fc5..13168d4e5 100644
--- a/data/storage/mysql/create_tariffplan_tables.sql
+++ b/data/storage/mysql/create_tariffplan_tables.sql
@@ -510,7 +510,7 @@ CREATE TABLE tp_lcr (
   `created_at` TIMESTAMP,
   PRIMARY KEY (`pk`),
   KEY `tpid` (`tpid`),
-  UNIQUE KEY `unique_tp_lcr` (`tpid`,`tenant`, `id`,`filter_ids` )
+  UNIQUE KEY `unique_tp_lcr` (`tpid`,`tenant`, `id`,`filter_ids`,`supplier_id`,`supplier_filter_ids`,`ratingplan_ids` )
 );
 
 --
diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql
index 42e447e08..43028824c 100644
--- a/data/storage/postgres/create_tariffplan_tables.sql
+++ b/data/storage/postgres/create_tariffplan_tables.sql
@@ -497,14 +497,14 @@ CREATE TABLE tp_filters (
     "strategy" varchar(32) NOT NULL,
     "strategy_params" varchar(64) NOT NULL,
     "supplier_id" varchar(32) NOT NULL,
-    "ratingplan_ids" varchar(64) NOT NULL,
     "supplier_filter_ids" varchar(64) NOT NULL,
+    "ratingplan_ids" varchar(64) NOT NULL,
     "supplier_weight" decimal(8,2) NOT NULL,
     "weight" decimal(8,2) NOT NULL,
     "created_at" TIMESTAMP WITH TIME ZONE
   );
  CREATE INDEX tp_lcr_idx ON tp_lcr (tpid);
- CREATE INDEX tp_lcr_unique ON tp_lcr  ("tpid",  "tenant", "id", "filter_ids");
+ CREATE INDEX tp_lcr_unique ON tp_lcr  ("tpid",  "tenant", "id", "filter_ids","supplier_id","supplier_filter_ids","ratingplan_ids");
 
 
 --
diff --git a/data/tariffplans/tutorial/Lcr.csv b/data/tariffplans/tutorial/Lcr.csv
index 1694dfe9d..65f2493bb 100644
--- a/data/tariffplans/tutorial/Lcr.csv
+++ b/data/tariffplans/tutorial/Lcr.csv
@@ -1,3 +1,5 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Strategy,StrategyParams,SupplierID,SupplierFilterIDs,RatingPlanIDs,SupplierWeight,Weight
-cgrates.org,LCR_1,FLTR_ACNT_dan;FLTR_DST_DE,2014-07-29T15:00:00Z,*lowest_cost,,supplier1,,RPL_1,10,20
-cgrates.org,LCR_1,,,,,supplier2,,RPL_2,20,
+cgrates.org,LCR_1,FLTR_ACNT_dan;FLTR_DST_DE,2014-07-29T15:00:00Z,*lowest_cost,,supplier1,FLTR_1,RPL_1,10,20
+cgrates.org,LCR_1,,,,,supplier1,FLTR_2,RPL_2,20,
+cgrates.org,LCR_1,,,,,supplier2,FLTR_1,RPL_2,20,
+