diff --git a/vitrage/entity_graph/processor/notifier.py b/vitrage/entity_graph/processor/notifier.py
index 3bd2b2511..12820c9a1 100644
--- a/vitrage/entity_graph/processor/notifier.py
+++ b/vitrage/entity_graph/processor/notifier.py
@@ -232,8 +232,8 @@ def _is_alarm_severity_change(before, curr):
         return False
     # returns true on activation, deactivation and severity change
     if not before and curr \
-            or (before.get(VProps.VITRAGE_AGGREGATED_SEVERITY) !=
-                curr.get(VProps.VITRAGE_AGGREGATED_SEVERITY)):
+            or (before.get(VProps.VITRAGE_OPERATIONAL_SEVERITY) !=
+                curr.get(VProps.VITRAGE_OPERATIONAL_SEVERITY)):
         return True
     return False
 
diff --git a/vitrage/persistency/service.py b/vitrage/persistency/service.py
index 6b3fa8160..3c92eabcd 100644
--- a/vitrage/persistency/service.py
+++ b/vitrage/persistency/service.py
@@ -102,6 +102,8 @@ class VitragePersistorEndpoint(object):
                 vitrage_type=data.get(VProps.VITRAGE_TYPE),
                 vitrage_aggregated_severity=data.get(
                     VProps.VITRAGE_AGGREGATED_SEVERITY),
+                vitrage_operational_severity=data.get(
+                    VProps.VITRAGE_OPERATIONAL_SEVERITY),
                 project_id=data.get(VProps.PROJECT_ID),
                 vitrage_resource_type=data.get(VProps.VITRAGE_RESOURCE_TYPE),
                 vitrage_resource_id=data.get(VProps.VITRAGE_RESOURCE_ID),
@@ -147,7 +149,7 @@ class VitragePersistorEndpoint(object):
             models.Change(
                 vitrage_id=data.get(VProps.VITRAGE_ID),
                 timestamp=event_timestamp,
-                severity=data.get(VProps.VITRAGE_AGGREGATED_SEVERITY),
+                severity=data.get(VProps.VITRAGE_OPERATIONAL_SEVERITY),
                 payload=data)
         self.db.changes.create(change_row)
 
diff --git a/vitrage/storage/history_facade.py b/vitrage/storage/history_facade.py
index f7f489479..dc415dcf9 100644
--- a/vitrage/storage/history_facade.py
+++ b/vitrage/storage/history_facade.py
@@ -68,15 +68,15 @@ class HistoryFacadeConnection(object):
             query, project_id, is_admin_project)
 
         query_severe = query.filter(
-            models.Alarm.vitrage_aggregated_severity == OSeverity.SEVERE)
+            models.Alarm.vitrage_operational_severity == OSeverity.SEVERE)
         query_critical = query.filter(
-            models.Alarm.vitrage_aggregated_severity == OSeverity.CRITICAL)
+            models.Alarm.vitrage_operational_severity == OSeverity.CRITICAL)
         query_warning = query.filter(
-            models.Alarm.vitrage_aggregated_severity == OSeverity.WARNING)
+            models.Alarm.vitrage_operational_severity == OSeverity.WARNING)
         query_ok = query.filter(
-            models.Alarm.vitrage_aggregated_severity == OSeverity.OK)
+            models.Alarm.vitrage_operational_severity == OSeverity.OK)
         query_na = query.filter(
-            models.Alarm.vitrage_aggregated_severity == OSeverity.NA)
+            models.Alarm.vitrage_operational_severity == OSeverity.NA)
 
         counts = {OSeverity.SEVERE: query_severe.count(),
                   OSeverity.CRITICAL: query_critical.count(),
@@ -258,8 +258,8 @@ class HistoryFacadeConnection(object):
     @staticmethod
     def _add_time_frame_to_query(query, start, end):
         start = timeutils.normalize_time(start)
-        end = timeutils.normalize_time(end)
         if start and end:
+            end = timeutils.normalize_time(end)
             query = \
                 query.filter(
                     or_(and_(models.Alarm.start_timestamp >= start,
diff --git a/vitrage/storage/sqlalchemy/models.py b/vitrage/storage/sqlalchemy/models.py
index 5bd503d14..2dae3069b 100644
--- a/vitrage/storage/sqlalchemy/models.py
+++ b/vitrage/storage/sqlalchemy/models.py
@@ -238,6 +238,8 @@ class Alarm(Base):
     vitrage_type = Column(String(64), nullable=False)
     vitrage_aggregated_severity = Column(String(64), index=True,
                                          nullable=False)
+    vitrage_operational_severity = Column(String(64), index=True,
+                                          nullable=False)
     project_id = Column(String(64), index=True)
     vitrage_resource_type = Column(String(64))
     vitrage_resource_id = Column(String(64))
@@ -253,6 +255,7 @@ class Alarm(Base):
             "name='%s'," \
             "vitrage_type='%s'," \
             "vitrage_aggregated_severity='%s'," \
+            "vitrage_operational_severity='%s'," \
             "project_id='%s'," \
             "vitrage_resource_type='%s'," \
             "vitrage_resource_id='%s'," \
@@ -265,6 +268,7 @@ class Alarm(Base):
                 self.name,
                 self.vitrage_type,
                 self.vitrage_aggregated_severity,
+                self.vitrage_operational_severity,
                 self.project_id,
                 self.vitrage_resource_type,
                 self.vitrage_resource_id,