diff --git a/scripts/lua/modules/historical_flow_utils.lua b/scripts/lua/modules/historical_flow_utils.lua
index 345b72353c..3abe199211 100644
--- a/scripts/lua/modules/historical_flow_utils.lua
+++ b/scripts/lua/modules/historical_flow_utils.lua
@@ -1090,7 +1090,7 @@ local additional_flow_columns = {
    ['THROUGHPUT'] =           { tag = "throughput",   dt_func = dt_format_thpt },
    ['DURATION'] =             { tag = "duration",     dt_func = dt_format_duration },   
    ['IPV4_ADDR'] =            { tag = "ip",           dt_func = dt_format_ip, select_func = "IPv4NumToString", where_func = "IPv4StringToNum", simple_dt_func = simple_format_ip },
-   -- ['IPV6_ADDR'] =            { tag = "ip",           dt_func = dt_format_ip, select_func = "IPv6NumToString", where_func = "IPv6StringToNum", simple_dt_func = simple_format_ip },
+   ['IPV6_ADDR'] =            { tag = "ip",           dt_func = dt_format_ip, select_func = "IPv6NumToString", where_func = "IPv6StringToNum", simple_dt_func = simple_format_ip },
    ['NETWORK_ID'] =           { tag = "network", dt_func = dt_format_network },
    ['ASN'] =                  { tag = "asn", simple_dt_func = simple_format_asn },
    ['COUNTRY_CODE'] =         { tag = "country", dt_func = dt_format_country },
@@ -1188,7 +1188,6 @@ historical_flow_utils.extra_where_tags = {
    ["vlan_id"] = "VLAN_ID",
    ["community_id"] = "COMMUNITY_ID",
    ["duration"] = "DURATION",
-
 }
 
 historical_flow_utils.topk_tags_v4 = {
@@ -1340,7 +1339,7 @@ function historical_flow_utils.get_flow_columns_to_tags(aggregated)
       if v.tag then 
          if not t2c[v.tag] then -- tag not already defined in real columns
             c2t[k] = v.tag
-            t2c[v.tag] = k
+            -- t2c[v.tag] = k
          end
       end
    end
diff --git a/scripts/templates/dashboard/enterprise-with-db.json b/scripts/templates/dashboard/enterprise-with-db.json
index 88f9147925..5b2ca2620c 100644
--- a/scripts/templates/dashboard/enterprise-with-db.json
+++ b/scripts/templates/dashboard/enterprise-with-db.json
@@ -145,7 +145,7 @@
 		},
 		{
 			"component" : "table",
-			"id" : "top_local_talkers",
+			"id" : "top_local_talkers_historical",
 			"i18n_name" : "report.top_local_hosts",
 			"width" : 4,
 			"height" : 4,
@@ -161,14 +161,14 @@
 				},
 				"table_type" : "db_search",
 				"columns" : [
-					{ "id" : "ip",		  "data_type" : "host",  "i18n_name" : "host_details.host" },
+					{ "id" : "ip",		"data_type" : "host",  "i18n_name" : "host_details.host" },
 					{ "id" : "total_bytes", "data_type" : "bytes", "i18n_name" : "volume" }
 				]
 			}
 		},
 		{
 			"component" : "table",
-			"id" : "top_remote_hosts",
+			"id" : "top_remote_hosts_historical",
 			"i18n_name" : "report.top_remote_hosts",
 			"width" : 4,
 			"height" : 4,
@@ -184,7 +184,7 @@
 				},
 				"table_type" : "db_search",
 				"columns" : [
-					{ "id" : "ip",		  "data_type" : "host",  "i18n_name" : "host_details.host" },
+					{ "id" : "ip",		"data_type" : "host",  "i18n_name" : "host_details.host" },
 					{ "id" : "total_bytes", "data_type" : "bytes", "i18n_name" : "volume" }
 				]
 			}