diff --git a/data/tariffplans/precache/Attributes.csv b/data/tariffplans/precache/Attributes.csv
index b96c5799a..d61f0819c 100644
--- a/data/tariffplans/precache/Attributes.csv
+++ b/data/tariffplans/precache/Attributes.csv
@@ -1,3 +1,4 @@
 #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight
-cgrates.org,ATTR_1,*sessions;*cdrs,*string:~*req.Account:1007,2014-01-14T00:00:00Z,,*req.Account,*constant,1001,false,10
+cgrates.org,ATTR_1,*sessions;*cdrs,*string:~*req.Account:1007,2014-01-14T00:00:00Z,,,,,false,10
+cgrates.org,ATTR_1,,,,,*req.Account,*constant,1001,,
 cgrates.org,ATTR_1,,,,,*req.Subject,*constant,1001,,
diff --git a/data/tariffplans/precache/Filters.csv b/data/tariffplans/precache/Filters.csv
index 9e07b08ec..dc31ce087 100644
--- a/data/tariffplans/precache/Filters.csv
+++ b/data/tariffplans/precache/Filters.csv
@@ -1,5 +1,6 @@
 #Tenant[0],ID[1],Type[2],Path[3],Values[4],ActivationInterval[5]
-cgrates.org,FLTR_1,*string,~*req.Account,1001;1002,2014-07-29T15:00:00Z
+cgrates.org,FLTR_1,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_1,*string,~*req.Account,1001;1002,
 cgrates.org,FLTR_1,*prefix,~*req.Destination,10;20,
 cgrates.org,FLTR_1,*rsr,~*req.Subject,~^1.*1$,
 cgrates.org,FLTR_1,*rsr,~*req.Destination,1002,
@@ -7,25 +8,32 @@ cgrates.org,FLTR_ACNT_1007,*string,~*req.Account,1007,2014-07-29T15:00:00Z
 cgrates.org,FLTR_ACNT_dan,*string,~*req.Account,dan,2014-07-29T15:00:00Z
 cgrates.org,FLTR_DST_DE,*destinations,~*req.Destination,DST_DE_MOBILE,2014-07-29T15:00:00Z
 cgrates.org,FLTR_DST_NL,*destinations,~*req.Destination,DST_NL,2014-07-29T15:00:00Z
-cgrates.org,FLTR_ACNT_BALANCE_1,*string,~*req.Account,1001;1002,2014-07-29T15:00:00Z
+cgrates.org,FLTR_ACNT_BALANCE_1,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_ACNT_BALANCE_1,*string,~*req.Account,1001;1002,
 cgrates.org,FLTR_ACNT_BALANCE_1,*string,~*req.EventType,BalanceUpdate,
 cgrates.org,FLTR_ACNT_BALANCE_1,*gte,~*req.Units,10.0,
-cgrates.org,FLTR_ACNT_EXPIRED,*string,~*req.Account,1001;1002,2014-07-29T15:00:00Z
+cgrates.org,FLTR_ACNT_EXPIRED,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_ACNT_EXPIRED,*string,~*req.Account,1001;1002,
 cgrates.org,FLTR_ACNT_EXPIRED,*gte,~*req.ExpiryTime,*now,
+cgrates.org,FLTR_STATS_1,,,,2014-07-29T15:00:00Z
 cgrates.org,FLTR_STATS_1,*string,~*req.Account,1002,
-cgrates.org,FLTR_STATS_1,*string,~*req.EventType,StatUpdate,2014-07-29T15:00:00Z
+cgrates.org,FLTR_STATS_1,*string,~*req.EventType,StatUpdate,
 cgrates.org,FLTR_STATS_1,*lt,~*req.ASR,40.0,
 cgrates.org,FLTR_STATS_1,*lt,~*req.ACD,3m,
-cgrates.org,FLTR_STATS_2,*string,~*req.EventType,StatUpdate,2014-07-29T15:00:00Z
+cgrates.org,FLTR_STATS_2,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_STATS_2,*string,~*req.EventType,StatUpdate,
 cgrates.org,FLTR_STATS_2,*string,~*req.StatID,STATS_HOURLY_DE,
 cgrates.org,FLTR_STATS_2,*gt,~*req.TCD,30m,
-cgrates.org,FLTR_STATS_3,*string,~*req.EventType,StatUpdate,2014-07-29T15:00:00Z
+cgrates.org,FLTR_STATS_3,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_STATS_3,*string,~*req.EventType,StatUpdate,
 cgrates.org,FLTR_STATS_3,*string,~*req.StatID,STATS_DAILY_DE,
 cgrates.org,FLTR_STATS_3,*gt,~*req.TCD,3h,
-cgrates.org,FLTR_RES_1,*string,~*req.EventType,ResourceUpdate,2014-07-29T15:00:00Z
+cgrates.org,FLTR_RES_1,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_RES_1,*string,~*req.EventType,ResourceUpdate,
 cgrates.org,FLTR_RES_1,*string,~*req.ResourceID,RES_GRP_1,
 cgrates.org,FLTR_RES_1,*gte,~*req.Usage,10.0,
-cgrates.org,FLTR_DST_FS,*string,~*req.Account,1001;1002;dan,2014-07-29T15:00:00Z
+cgrates.org,FLTR_DST_FS,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_DST_FS,*string,~*req.Account,1001;1002;dan,
 cgrates.org,FLTR_DST_FS,*destinations,~*req.Destination,DST_FS,
 cgrates.org,FLTR_RES_GR3,*string,~*req.Account,3001,2014-07-29T15:00:00Z
 cgrates.org,FLTR_STS1,*string,~*req.Account,1001;1002,2014-07-29T15:00:00Z
diff --git a/data/tariffplans/precache/Routes.csv b/data/tariffplans/precache/Routes.csv
index 0b52afdd4..5c1578f7b 100644
--- a/data/tariffplans/precache/Routes.csv
+++ b/data/tariffplans/precache/Routes.csv
@@ -1,8 +1,12 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
 cgrates.org,ROUTE_WEIGHT_2,,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,5
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,10
+
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,10
+cgrates.org,ROUTE_WEIGHT_1,,,,,route1,,,,,,10,,,
 cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,,
 cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,15,,,
-cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,,10
+
+cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,,,,,,,,,,10
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route1,,,RP_SPECIAL_1002,,,10,false,,
 cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,,
 cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,,
diff --git a/data/tariffplans/precache/Stats.csv b/data/tariffplans/precache/Stats.csv
index 3543ba4d9..a14abd2a9 100644
--- a/data/tariffplans/precache/Stats.csv
+++ b/data/tariffplans/precache/Stats.csv
@@ -1,4 +1,5 @@
 #Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12]
-cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*asr;*acc;*tcc;*acd;*tcd,,true,false,20,*none
+cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,,,true,false,20,*none
+cgrates.org,Stats1,,,,,,*asr;*acc;*tcc;*acd;*tcd,,,,,
 cgrates.org,Stats1,,,,,,*sum#~*req.Usage;*average#~*req.Usage,,,,,
 cgrates.org,Stats1,,,,,,*pdd,*exists:~PDD:,,,,
\ No newline at end of file
diff --git a/data/tariffplans/testit/Attributes.csv b/data/tariffplans/testit/Attributes.csv
index 4b0f4089b..e2514760f 100644
--- a/data/tariffplans/testit/Attributes.csv
+++ b/data/tariffplans/testit/Attributes.csv
@@ -5,6 +5,7 @@ cgrates.org,ATTR_PAYPAL,*cdrs,*string:~*req.Subject:ANY2CNT,,,*req.PayPalAccount
 cgrates.org,ATTR_SUBJECT_CASE1,*sessions,*string:~*req.OriginID:testSSv1ItProcessEventWithGetCost,,,*req.Subject,*constant,ANY2CNT,false,10
 cgrates.org,ATTR_SUBJECT_CASE2,*sessions,*string:~*req.OriginID:testSSv1ItProcessEventWithGetCost2,,,*req.Subject,*constant,SPECIAL_1002,false,10
 cgrates.org,ATTR_SUBJECT_CASE3,*sessions,*string:~*req.OriginID:testSSv1ItProcessEventWithGetCost3,,,*req.Subject,*constant,RP_RETAIL,false,10
-cgrates.org,ATTR_SUBJECT_CASE4,*sessions,*string:~*req.OriginID:testSSv1ItProcessEventWithGetCost4,,,*req.Subject,*constant,InvalidSubject,false,10
+cgrates.org,ATTR_SUBJECT_CASE4,*sessions,*string:~*req.OriginID:testSSv1ItProcessEventWithGetCost4,,,,,,false,10
+cgrates.org,ATTR_SUBJECT_CASE4,,,,,*req.Subject,*constant,InvalidSubject,,
 cgrates.org,ATTR_SUBJECT_CASE4,,,,,*req.Category,*constant,Standard,false,10
 cgrates.org,ATTR_VARIABLE,*any,*string:~*req.EventName:VariableTest,,,*req.Category,*variable,~*req.ToR,false,20
diff --git a/data/tariffplans/testit/Filters.csv b/data/tariffplans/testit/Filters.csv
index 71445f5ca..b97e445e1 100644
--- a/data/tariffplans/testit/Filters.csv
+++ b/data/tariffplans/testit/Filters.csv
@@ -1,13 +1,15 @@
 #Tenant[0],ID[1],Type[2],Path[3],Values[4],ActivationInterval[5]
 cgrates.org,FLTR_ACCOUNT_1001,*string,~*req.Account,1001,2014-07-29T15:00:00Z
 cgrates.org,FLTR_DST_DE,*destinations,~*req.Destination,DST_DE_MOBILE,2014-07-29T15:00:00Z
-cgrates.org,FLTR_1,*string,~*req.Account,1003;1002,2014-07-29T15:00:00Z
+cgrates.org,FLTR_1,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_1,*string,~*req.Account,1003;1002,
 cgrates.org,FLTR_1,*prefix,~*req.Destination,10;20,
 cgrates.org,FLTR_1,*rsr,~*req.Destination,1002,
 cgrates.org,FLTR_ACNT_1007,*string,~*req.Account,1007,2014-07-29T15:00:00Z
 cgrates.org,FLTR_ACNT_dan,*string,~*req.Account,dan,2014-07-29T15:00:00Z
 cgrates.org,FLTR_SPP_ACNT_dan,*string,~*req.Account,dan,2014-07-29T15:00:00Z
-cgrates.org,FLTR_SPP_2,*string,~*req.Account,1003,2014-07-29T15:00:00Z
+cgrates.org,FLTR_SPP_2,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_SPP_2,*string,~*req.Account,1003,
 cgrates.org,FLTR_SPP_2,*prefix,~*req.Destination,10;20,
 cgrates.org,FLTR_SPP_2,*string,~*req.DistinctMatch,*highest_cost,
 cgrates.org,FLTR_SPP_3,*string,~*req.DistinctMatch,*qos,2014-07-29T15:00:00Z
@@ -19,7 +21,8 @@ cgrates.org,FLTR_SPP_5,*string,~*req.DistinctMatch,*qos3,2014-07-29T15:00:00Z
 cgrates.org,FLTR_STAT_1_1,*string,~*req.Stat,Stat1_1,2014-07-29T15:00:00Z
 cgrates.org,FLTR_SPP_6,*string,~*req.DistinctMatch,*qos_filtred,2014-07-29T15:00:00Z
 cgrates.org,FLTR_QOS_SP1,*gte,~*vars.*acd,10s,2014-07-29T15:00:00Z
-cgrates.org,FLTR_QOS_SP2,*gte,~*vars.*acd,10s,2014-07-29T15:00:00Z
+cgrates.org,FLTR_QOS_SP2,,,,2014-07-29T15:00:00Z
+cgrates.org,FLTR_QOS_SP2,*gte,~*vars.*acd,10s,
 cgrates.org,FLTR_QOS_SP2,*gte,~*vars.*tcd,11s,
 cgrates.org,FLTR_SPP_QOS_2,*string,~*req.DistinctMatch,*qos_filtred2,2014-07-29T15:00:00Z
 cgrates.org,FLTR_QOS_SP1_2,*gte,~*vars.Cost,0.1,2014-07-29T15:00:00Z
diff --git a/data/tariffplans/testit/Routes.csv b/data/tariffplans/testit/Routes.csv
index f8ecb6c74..3556eb694 100644
--- a/data/tariffplans/testit/Routes.csv
+++ b/data/tariffplans/testit/Routes.csv
@@ -1,44 +1,55 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
-cgrates.org,ROUTE_ACNT_1001,FLTR_ACCOUNT_1001,,*weight,,route1,,,,,,20,,,10
+cgrates.org,ROUTE_ACNT_1001,FLTR_ACCOUNT_1001,,*weight,,,,,,,,,,,10
+cgrates.org,ROUTE_ACNT_1001,,,,,route1,,,,,,20,,,
 cgrates.org,ROUTE_ACNT_1001,,,,,route2,,,,,,10,,,
 
 cgrates.org,ROUTE_WEIGHT_2,,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,5
 
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,10
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,10
+cgrates.org,ROUTE_WEIGHT_1,,,,,route1,,,,,,10,,,
 cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,,
 cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_SPP_ACNT_dan,,,,,15,,,
 
-cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,,10
+cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,,,,,,,,,,10
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route1,,,RP_SPECIAL_1002,,,10,false,,
 cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,,
 cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,,
 
-cgrates.org,ROUTE_HIGHESTCOST_1,FLTR_SPP_2,2017-11-27T00:00:00Z,*hc,,route1,,,RP_SPECIAL_1002,,,10,false,,20
+cgrates.org,ROUTE_HIGHESTCOST_1,FLTR_SPP_2,2017-11-27T00:00:00Z,*hc,,,,,,,,,,,20
+cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route1,,,RP_SPECIAL_1002,,,10,false,,
 cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,,
 cgrates.org,ROUTE_HIGHESTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,,
 
-cgrates.org,ROUTE_QOS_1,FLTR_SPP_3,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,route1,,,,,Stat_1;Stat_1_1,10,false,,20
+cgrates.org,ROUTE_QOS_1,FLTR_SPP_3,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,,,,,,,,,,20
+cgrates.org,ROUTE_QOS_1,,,,,route1,,,,,Stat_1;Stat_1_1,10,false,,
 cgrates.org,ROUTE_QOS_1,,,,,route2,,,,,Stat_2,20,,,
 cgrates.org,ROUTE_QOS_1,,,,,route3,,,,,Stat_3,35,,,
 
-cgrates.org,ROUTE_QOS_2,FLTR_SPP_4,2017-11-27T00:00:00Z,*qos,*dcc,route1,,,,,Stat_1;Stat_1_1,10,false,,20
+cgrates.org,ROUTE_QOS_2,FLTR_SPP_4,2017-11-27T00:00:00Z,*qos,*dcc,,,,,,,,,,20
+cgrates.org,ROUTE_QOS_2,,,,,route1,,,,,Stat_1;Stat_1_1,10,false,,
 cgrates.org,ROUTE_QOS_2,,,,,route2,,,,,Stat_2,20,,,
 cgrates.org,ROUTE_QOS_2,,,,,route3,,,,,Stat_3,35,,,
 
-cgrates.org,ROUTE_QOS_3,FLTR_SPP_5,2017-11-27T00:00:00Z,*qos,*pdd,route1,,,,,Stat_1;Stat_1_1,10,false,,20
+cgrates.org,ROUTE_QOS_3,FLTR_SPP_5,2017-11-27T00:00:00Z,*qos,*pdd,,,,,,,,,,20
+cgrates.org,ROUTE_QOS_3,,,,,route1,,,,,Stat_1;Stat_1_1,10,false,,
 cgrates.org,ROUTE_QOS_3,,,,,route2,,,,,Stat_2,20,,,
 cgrates.org,ROUTE_QOS_3,,,,,route3,,,,,Stat_3,35,,,
 
-cgrates.org,ROUTE_QOS_FILTRED,FLTR_SPP_6,2017-11-27T00:00:00Z,*qos,*pdd,route1,FLTR_QOS_SP1,,,,Stat_1;Stat_1_1,10,false,,20
+cgrates.org,ROUTE_QOS_FILTRED,FLTR_SPP_6,2017-11-27T00:00:00Z,*qos,*pdd,,,,,,,,,,20
+cgrates.org,ROUTE_QOS_FILTRED,,,,,route1,FLTR_QOS_SP1,,,,Stat_1;Stat_1_1,10,false,,
 cgrates.org,ROUTE_QOS_FILTRED,,,,,route2,FLTR_QOS_SP2,,,,Stat_2,20,,,
 cgrates.org,ROUTE_QOS_FILTRED,,,,,route3,,,,,Stat_3,35,,,
 
-cgrates.org,ROUTE_QOS_FILTRED2,FLTR_SPP_QOS_2,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,route1,FLTR_QOS_SP1_2,,RP_SPECIAL_1002,,Stat_1;Stat_1_1,10,false,,20
+cgrates.org,ROUTE_QOS_FILTRED2,FLTR_SPP_QOS_2,2017-11-27T00:00:00Z,*qos,*acd;*tcd;*asr,,,,,,,,,,20
+cgrates.org,ROUTE_QOS_FILTRED2,,,,,route1,FLTR_QOS_SP1_2,,RP_SPECIAL_1002,,Stat_1;Stat_1_1,10,false,,
 cgrates.org,ROUTE_QOS_FILTRED2,,,,,route2,FLTR_QOS_SP2_2,,RP_RETAIL1,,Stat_2,20,,,
 cgrates.org,ROUTE_QOS_FILTRED2,,,,,route3,,,,,Stat_3,35,,,
 
-cgrates.org,ROUTE_LCR,FLTR_TEST,2017-11-27T00:00:00Z,*lc,,route_1,,,RP_TEST_1,,,10,,,50
+cgrates.org,ROUTE_LCR,FLTR_TEST,2017-11-27T00:00:00Z,*lc,,,,,,,,,,,50
+cgrates.org,ROUTE_LCR,,,,,route_1,,,RP_TEST_1,,,10,,,
 cgrates.org,ROUTE_LCR,,,,,route_2,,,RP_TEST_2,,,,,,
 
-cgrates.org,ROUTE_LOAD_DIST,FLTR_SPP_LOAD_DIST,,*load,route1:2;route2:7;*default:5,route1,,,,,Stat_Supplier1:*sum#~*req.LoadReq,10,false,,20
+cgrates.org,ROUTE_LOAD_DIST,FLTR_SPP_LOAD_DIST,,*load,route1:2;route2:7;*default:5,,,,,,,,,,20
+cgrates.org,ROUTE_LOAD_DIST,,,,,route1,,,,,Stat_Supplier1:*sum#~*req.LoadReq,10,false,,
 cgrates.org,ROUTE_LOAD_DIST,,,,,route2,,,,,Stat_Supplier2:*sum#~*req.LoadReq,20,,,
 cgrates.org,ROUTE_LOAD_DIST,,,,,route3,,,,,Stat_Supplier3:*sum#~*req.LoadReq,35,,,
\ No newline at end of file
diff --git a/data/tariffplans/tut_sip_redirect/Routes.csv b/data/tariffplans/tut_sip_redirect/Routes.csv
index f7ac9814b..04dc8f077 100644
--- a/data/tariffplans/tut_sip_redirect/Routes.csv
+++ b/data/tariffplans/tut_sip_redirect/Routes.csv
@@ -1,11 +1,11 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
 
-cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,20
-cgrates.org,ROUTE_ACNT_1001,,,,,route1,,1001,RP_10CNT,,,20,,cgrates.org,20
-cgrates.org,ROUTE_ACNT_1001,,,,,route2,,1001,RP_20CNT,,,10,,cgrates.net,10
-cgrates.org,ROUTE_ACNT_1001,,,,,route3,,1001,RP_1CNT,,,5,,cgrates.com,5
+cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,5
+cgrates.org,ROUTE_ACNT_1001,,,,,route1,,1001,RP_10CNT,,,20,,cgrates.org,
+cgrates.org,ROUTE_ACNT_1001,,,,,route2,,1001,RP_20CNT,,,10,,cgrates.net,
+cgrates.org,ROUTE_ACNT_1001,,,,,route3,,1001,RP_1CNT,,,5,,cgrates.com,
 
-cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,20
-cgrates.org,ROUTE_ACNT_1002,,,,,route1,,1002,RP_10CNT,,,20,,1003@192.168.56.203,20
-cgrates.org,ROUTE_ACNT_1002,,,,,route2,,1002,RP_20CNT,,,10,,1004@192.168.57.203,10
-cgrates.org,ROUTE_ACNT_1002,,,,,route3,,1002,RP_1CNT,,,5,,1005@192.168.58.203,5
+cgrates.org,ROUTE_ACNT_1002,*string:~*req.Account:1002,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,5
+cgrates.org,ROUTE_ACNT_1002,,,,,route1,,1002,RP_10CNT,,,20,,1003@192.168.56.203,
+cgrates.org,ROUTE_ACNT_1002,,,,,route2,,1002,RP_20CNT,,,10,,1004@192.168.57.203,
+cgrates.org,ROUTE_ACNT_1002,,,,,route3,,1002,RP_1CNT,,,5,,1005@192.168.58.203,
diff --git a/data/tariffplans/tutorial/Attributes.csv b/data/tariffplans/tutorial/Attributes.csv
index 785c033f8..b7edc86a1 100644
--- a/data/tariffplans/tutorial/Attributes.csv
+++ b/data/tariffplans/tutorial/Attributes.csv
@@ -28,7 +28,7 @@ cgrates.org,ATTR_ACC_ALIAS,*any,*string:~*req.SubscriberId:1006,,,,,,false,10
 cgrates.org,ATTR_ACC_ALIAS,,,,,*req.Account,*constant,1001,,
 cgrates.org,ATTR_ACC_ALIAS,,,,,*req.RequestType,*constant,*prepaid,,
 
-cgrates.com,ATTR_TNT_ALIAS,*any,*string:~*req.SubscriberId:1006,,,,,false,10
+cgrates.com,ATTR_TNT_ALIAS,*any,*string:~*req.SubscriberId:1006,,,,,,false,10
 cgrates.com,ATTR_TNT_ALIAS,,,,,*req.Account,*constant,1001,,
 cgrates.com,ATTR_TNT_ALIAS,,,,,*req.RequestType,*constant,*prepaid,,
 cgrates.com,ATTR_TNT_ALIAS,,,,,*tenant,*constant,cgrates.org,,