diff --git a/TSG-21.06/clickhouse/connection_record_log.sql b/TSG-21.06/clickhouse/connection_record_log.sql
index d8194ea..7fbdf6a 100644
--- a/TSG-21.06/clickhouse/connection_record_log.sql
+++ b/TSG-21.06/clickhouse/connection_record_log.sql
@@ -1,4 +1,5 @@
 ALTER TABLE tsg_galaxy_v3.connection_record_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.connection_record_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.connection_record_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.connection_record_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
@@ -9,4 +10,4 @@ ALTER TABLE tsg_galaxy_v3.connection_record_log ON CLUSTER ck_cluster ADD COLUMN
 
 
 ALTER TABLE tsg_galaxy_v3.connection_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
-ALTER TABLE tsg_galaxy_v3.connection_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS ftp_link_type String after ftp_content;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.connection_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS ftp_link_type String after ftp_content;
diff --git a/TSG-21.06/clickhouse/gtpc_record_log.sql b/TSG-21.06/clickhouse/gtpc_record_log.sql
index d76b885..86c4e9f 100644
--- a/TSG-21.06/clickhouse/gtpc_record_log.sql
+++ b/TSG-21.06/clickhouse/gtpc_record_log.sql
@@ -1,8 +1,9 @@
 ALTER TABLE tsg_galaxy_v3.gtpc_record_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.gtpc_record_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.gtpc_record_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.gtpc_record_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
 ALTER TABLE tsg_galaxy_v3.gtpc_record_log ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
 
 
-ALTER TABLE tsg_galaxy_v3.gtpc_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.gtpc_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
diff --git a/TSG-21.06/clickhouse/live_session_record_log.sql b/TSG-21.06/clickhouse/live_session_record_log.sql
index 598d737..f5289cf 100644
--- a/TSG-21.06/clickhouse/live_session_record_log.sql
+++ b/TSG-21.06/clickhouse/live_session_record_log.sql
@@ -1,4 +1,5 @@
 ALTER TABLE tsg_galaxy_v3.live_session_record_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.live_session_record_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.live_session_record_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.live_session_record_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
@@ -9,4 +10,4 @@ ALTER TABLE tsg_galaxy_v3.live_session_record_log ON CLUSTER ck_cluster ADD COLU
 
 
 ALTER TABLE tsg_galaxy_v3.live_session_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
-ALTER TABLE tsg_galaxy_v3.live_session_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS ftp_link_type String after ftp_content;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.live_session_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS ftp_link_type String after ftp_content;
diff --git a/TSG-21.06/clickhouse/proxy_event_log.sql b/TSG-21.06/clickhouse/proxy_event_log.sql
index d6c905e..33b5a86 100644
--- a/TSG-21.06/clickhouse/proxy_event_log.sql
+++ b/TSG-21.06/clickhouse/proxy_event_log.sql
@@ -1,10 +1,8 @@
 ALTER TABLE tsg_galaxy_v3.proxy_event_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.proxy_event_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.proxy_event_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.proxy_event_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
 ALTER TABLE tsg_galaxy_v3.proxy_event_log ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
 
-
-
-
-ALTER TABLE tsg_galaxy_v3.proxy_event_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.proxy_event_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
diff --git a/TSG-21.06/clickhouse/radius_record_log.sql b/TSG-21.06/clickhouse/radius_record_log.sql
index 33944b7..352dca9 100644
--- a/TSG-21.06/clickhouse/radius_record_log.sql
+++ b/TSG-21.06/clickhouse/radius_record_log.sql
@@ -1,4 +1,5 @@
 ALTER TABLE tsg_galaxy_v3.radius_record_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.radius_record_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.radius_record_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.radius_record_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
@@ -6,4 +7,4 @@ ALTER TABLE tsg_galaxy_v3.radius_record_log ON CLUSTER ck_cluster ADD COLUMN IF
 
 
 
-ALTER TABLE tsg_galaxy_v3.radius_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.radius_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
diff --git a/TSG-21.06/clickhouse/security_event_log.sql b/TSG-21.06/clickhouse/security_event_log.sql
index c815b5a..35e979b 100644
--- a/TSG-21.06/clickhouse/security_event_log.sql
+++ b/TSG-21.06/clickhouse/security_event_log.sql
@@ -1,4 +1,5 @@
 ALTER TABLE tsg_galaxy_v3.security_event_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.security_event_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.security_event_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.security_event_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
diff --git a/TSG-21.06/clickhouse/sys_packet_capture_log.sql b/TSG-21.06/clickhouse/sys_packet_capture_log.sql
index d07343d..35be06d 100644
--- a/TSG-21.06/clickhouse/sys_packet_capture_log.sql
+++ b/TSG-21.06/clickhouse/sys_packet_capture_log.sql
@@ -1,4 +1,5 @@
 ALTER TABLE tsg_galaxy_v3.sys_packet_capture_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.sys_packet_capture_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.sys_packet_capture_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.sys_packet_capture_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
diff --git a/TSG-21.06/clickhouse/transaction_record_log.sql b/TSG-21.06/clickhouse/transaction_record_log.sql
index f0e119c..f6bfdc5 100644
--- a/TSG-21.06/clickhouse/transaction_record_log.sql
+++ b/TSG-21.06/clickhouse/transaction_record_log.sql
@@ -1,8 +1,9 @@
 ALTER TABLE tsg_galaxy_v3.transaction_record_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.transaction_record_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.transaction_record_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.transaction_record_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
 ALTER TABLE tsg_galaxy_v3.transaction_record_log ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
 
 
-ALTER TABLE tsg_galaxy_v3.transaction_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.transaction_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
diff --git a/TSG-21.06/clickhouse/voip_record_log.sql b/TSG-21.06/clickhouse/voip_record_log.sql
index 24647cc..a3cf4b3 100644
--- a/TSG-21.06/clickhouse/voip_record_log.sql
+++ b/TSG-21.06/clickhouse/voip_record_log.sql
@@ -1,5 +1,5 @@
-
 ALTER TABLE tsg_galaxy_v3.voip_record_log ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
+ALTER TABLE tsg_galaxy_v3.voip_record_log ON CLUSTER ck_query DROP COLUMN IF EXISTS common_service_category;
 ALTER TABLE tsg_galaxy_v3.voip_record_log_local ON CLUSTER ck_cluster DROP COLUMN IF EXISTS common_service_category;
 
 ALTER TABLE tsg_galaxy_v3.voip_record_log_local ON CLUSTER ck_cluster ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
@@ -7,4 +7,4 @@ ALTER TABLE tsg_galaxy_v3.voip_record_log ON CLUSTER ck_cluster ADD COLUMN IF NO
 
 
 
-ALTER TABLE tsg_galaxy_v3.voip_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;
\ No newline at end of file
+ALTER TABLE tsg_galaxy_v3.voip_record_log ON CLUSTER ck_query ADD COLUMN IF NOT EXISTS common_service_category Array(Int64) after common_protocol_label;