diff --git a/api/chalicelib/core/alerts.py b/api/chalicelib/core/alerts.py
index 3c8b00c54..dfa86ed75 100644
--- a/api/chalicelib/core/alerts.py
+++ b/api/chalicelib/core/alerts.py
@@ -116,7 +116,7 @@ def process_notifications(data):
     BATCH_SIZE = 200
     for t in full.keys():
         for i in range(0, len(full[t]), BATCH_SIZE):
-            notifications_list = full[t][i:i + BATCH_SIZE]
+            notifications_list = full[t][i:min(i + BATCH_SIZE, len(full[t]))]
             if notifications_list is None or len(notifications_list) == 0:
                 break
 
diff --git a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
index 308acbda1..0418c5d7d 100644
--- a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
@@ -947,13 +947,14 @@ $$
 
             CREATE TABLE IF NOT EXISTS events.clicks
             (
-                session_id bigint          NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
-                message_id bigint          NOT NULL,
-                timestamp  bigint          NOT NULL,
-                label      text DEFAULT NULL,
-                url        text DEFAULT '' NOT NULL,
+                session_id bigint             NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
+                message_id bigint             NOT NULL,
+                timestamp  bigint             NOT NULL,
+                label      text    DEFAULT NULL,
+                url        text    DEFAULT '' NOT NULL,
                 path       text,
-                selector   text DEFAULT '' NOT NULL,
+                selector   text    DEFAULT '' NOT NULL,
+                hesitation integer DEFAULT NULL,
                 PRIMARY KEY (session_id, message_id)
             );
             CREATE INDEX IF NOT EXISTS clicks_session_id_idx ON events.clicks (session_id);
@@ -974,8 +975,10 @@ $$
                 session_id bigint NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
                 message_id bigint NOT NULL,
                 timestamp  bigint NOT NULL,
-                label      text DEFAULT NULL,
-                value      text DEFAULT NULL,
+                label      text    DEFAULT NULL,
+                value      text    DEFAULT NULL,
+                duration   integer DEFAULT NULL,
+                hesitation integer DEFAULT NULL,
                 PRIMARY KEY (session_id, message_id)
             );
             CREATE INDEX IF NOT EXISTS inputs_session_id_idx ON events.inputs (session_id);
diff --git a/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/scripts/schema/db/init_dbs/postgresql/init_schema.sql
index 14b6550a2..2fe532636 100644
--- a/scripts/schema/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/schema/db/init_dbs/postgresql/init_schema.sql
@@ -628,13 +628,14 @@ $$
 
             CREATE TABLE events.clicks
             (
-                session_id bigint          NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
-                message_id bigint          NOT NULL,
-                timestamp  bigint          NOT NULL,
-                label      text DEFAULT NULL,
-                url        text DEFAULT '' NOT NULL,
+                session_id bigint             NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
+                message_id bigint             NOT NULL,
+                timestamp  bigint             NOT NULL,
+                label      text    DEFAULT NULL,
+                url        text    DEFAULT '' NOT NULL,
                 path       text,
-                selector   text DEFAULT '' NOT NULL,
+                selector   text    DEFAULT '' NOT NULL,
+                hesitation integer DEFAULT NULL,
                 PRIMARY KEY (session_id, message_id)
             );
             CREATE INDEX clicks_session_id_idx ON events.clicks (session_id);
@@ -654,8 +655,10 @@ $$
                 session_id bigint NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
                 message_id bigint NOT NULL,
                 timestamp  bigint NOT NULL,
-                label      text DEFAULT NULL,
-                value      text DEFAULT NULL,
+                label      text    DEFAULT NULL,
+                value      text    DEFAULT NULL,
+                duration   integer DEFAULT NULL,
+                hesitation integer DEFAULT NULL,
                 PRIMARY KEY (session_id, message_id)
             );
             CREATE INDEX inputs_session_id_idx ON events.inputs (session_id);