diff --git a/core/clickhouse/model.py b/core/clickhouse/model.py
index 455187d9b81fd4dbffffcf548366bf7b5b9de132..3ac5271dc1226c9dc407412634200e2311140a97 100644
--- a/core/clickhouse/model.py
+++ b/core/clickhouse/model.py
@@ -154,7 +154,7 @@ class Model(object, metaclass=ModelBase):
         :return:
         """
         return (
-            f"CREATE TABLE IF NOT EXISTS {cls._get_distributed_db_table()} "
+            f"CREATE TABLE IF NOT EXISTS {cls._get_distributed_db_table()} AS {cls._get_raw_db_table()} "
             f"ENGINE = Distributed('{config.clickhouse.cluster}', '{config.clickhouse.db}', '{cls._get_raw_db_table()}')"
         )
 
diff --git a/pm/models/metricscope.py b/pm/models/metricscope.py
index 11704e653419e1c74713c7de043f620e9e37210b..0ca8c33931c7e9150c2935890061f5fb62598afa 100644
--- a/pm/models/metricscope.py
+++ b/pm/models/metricscope.py
@@ -223,7 +223,7 @@ class MetricScope(Document):
             "AS %s "
             "ENGINE = Distributed(%s, %s, %s)"
             % (
-                self.table_name,
+                self._get_distributed_db_table(),
                 self._get_raw_db_table(),
                 config.clickhouse.cluster,
                 config.clickhouse.db,
diff --git a/services/datastream/streams/alarm.py b/services/datastream/streams/alarm.py
index c366b7a9294e5a195a0a9486274117fc607ae1af..32d4c23ac16673a5a161a4f9c5875d596cb203d4 100644
--- a/services/datastream/streams/alarm.py
+++ b/services/datastream/streams/alarm.py
@@ -39,7 +39,7 @@ class AlarmDataStream(DataStream):
             "labels": [],
             "tags": [],  # Alias for compat
         }
-        for label in alarm.effective_labels:
+        for label in alarm.labels:
             if Label.get_effective_setting(label=label, setting="expose_datastream"):
                 r["labels"].append(label)
                 r["tags"].append(label)