diff --git a/__init__.py b/__init__.py
index 4c05755..3727c67 100644
--- a/__init__.py
+++ b/__init__.py
@@ -4,4 +4,4 @@
 JIVAS is an Agentic Framework for rapidly prototyping and deploying graph-based, AI solutions.
 """
 
-__version__ = "2.1.21"
+__version__ = "2.1.22"
diff --git a/core/jivas/agent/analytics/get_interactions_by_date.jac b/core/jivas/agent/analytics/get_interactions_by_date.jac
index d650cfb..560ce77 100644
--- a/core/jivas/agent/analytics/get_interactions_by_date.jac
+++ b/core/jivas/agent/analytics/get_interactions_by_date.jac
@@ -12,6 +12,7 @@ walker get_interactions_by_date(agent_graph_walker) {
     has start_date: str = "";
     has end_date: str = "";
 	has timezone: str = "UTC";
+	has channel: str = "";
 
 	# set up logger
     static has logger:Logger = logging.getLogger(__name__);
@@ -32,18 +33,21 @@ walker get_interactions_by_date(agent_graph_walker) {
 
 	    try {
 			collection = NodeAnchor.Collection.get_collection("interactions");
+			match_query = {
+				"agent_id": self.agent_id,
+				"time_stamp": {
+					"$gte": start.isoformat(),
+					"$lte": end.isoformat()
+				}
+			};
+
+			if (self.channel) {
+				match_query["channel"] = self.channel;
+			}
 
 			pipeline = [
 				# Match documents for the agent within date range
-				{
-					"$match": {
-						"agent_id": self.agent_id,
-						"time_stamp": {
-							"$gte": start.isoformat(),
-							"$lte": end.isoformat()
-						}
-					}
-				},
+				{"$match": match_query},
 				# Convert string timestamp to date object and group by local date
 				{
 					"$group": {
diff --git a/jvcli/jvcli/templates/2.1.21/project/README.md b/jvcli/jvcli/templates/2.1.22/project/README.md
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/README.md
rename to jvcli/jvcli/templates/2.1.22/project/README.md
diff --git a/jvcli/jvcli/templates/2.1.21/project/actions/README.md b/jvcli/jvcli/templates/2.1.22/project/actions/README.md
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/actions/README.md
rename to jvcli/jvcli/templates/2.1.22/project/actions/README.md
diff --git a/jvcli/jvcli/templates/2.1.21/project/daf/README.md b/jvcli/jvcli/templates/2.1.22/project/daf/README.md
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/daf/README.md
rename to jvcli/jvcli/templates/2.1.22/project/daf/README.md
diff --git a/jvcli/jvcli/templates/2.1.21/project/env.example b/jvcli/jvcli/templates/2.1.22/project/env.example
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/env.example
rename to jvcli/jvcli/templates/2.1.22/project/env.example
diff --git a/jvcli/jvcli/templates/2.1.21/project/gitignore.example b/jvcli/jvcli/templates/2.1.22/project/gitignore.example
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/gitignore.example
rename to jvcli/jvcli/templates/2.1.22/project/gitignore.example
diff --git a/jvcli/jvcli/templates/2.1.21/project/globals.jac b/jvcli/jvcli/templates/2.1.22/project/globals.jac
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/globals.jac
rename to jvcli/jvcli/templates/2.1.22/project/globals.jac
diff --git a/jvcli/jvcli/templates/2.1.21/project/main.jac b/jvcli/jvcli/templates/2.1.22/project/main.jac
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/main.jac
rename to jvcli/jvcli/templates/2.1.22/project/main.jac
diff --git a/jvcli/jvcli/templates/2.1.21/project/tests/README.md b/jvcli/jvcli/templates/2.1.22/project/tests/README.md
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/project/tests/README.md
rename to jvcli/jvcli/templates/2.1.22/project/tests/README.md
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/CHANGELOG.md b/jvcli/jvcli/templates/2.1.22/sourcefiles/CHANGELOG.md
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/CHANGELOG.md
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/CHANGELOG.md
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/README.md b/jvcli/jvcli/templates/2.1.22/sourcefiles/README.md
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/README.md
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/README.md
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/action_app.py b/jvcli/jvcli/templates/2.1.22/sourcefiles/action_app.py
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/action_app.py
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/action_app.py
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/action_archetype.jac b/jvcli/jvcli/templates/2.1.22/sourcefiles/action_archetype.jac
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/action_archetype.jac
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/action_archetype.jac
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/action_info.yaml b/jvcli/jvcli/templates/2.1.22/sourcefiles/action_info.yaml
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/action_info.yaml
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/action_info.yaml
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/action_lib.jac b/jvcli/jvcli/templates/2.1.22/sourcefiles/action_lib.jac
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/action_lib.jac
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/action_lib.jac
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/agent_descriptor.yaml b/jvcli/jvcli/templates/2.1.22/sourcefiles/agent_descriptor.yaml
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/agent_descriptor.yaml
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/agent_descriptor.yaml
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/agent_info.yaml b/jvcli/jvcli/templates/2.1.22/sourcefiles/agent_info.yaml
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/agent_info.yaml
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/agent_info.yaml
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/agent_knowledge.yaml b/jvcli/jvcli/templates/2.1.22/sourcefiles/agent_knowledge.yaml
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/agent_knowledge.yaml
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/agent_knowledge.yaml
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/agent_memory.yaml b/jvcli/jvcli/templates/2.1.22/sourcefiles/agent_memory.yaml
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/agent_memory.yaml
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/agent_memory.yaml
diff --git a/jvcli/jvcli/templates/2.1.21/sourcefiles/interact_action_archetype.jac b/jvcli/jvcli/templates/2.1.22/sourcefiles/interact_action_archetype.jac
similarity index 100%
rename from jvcli/jvcli/templates/2.1.21/sourcefiles/interact_action_archetype.jac
rename to jvcli/jvcli/templates/2.1.22/sourcefiles/interact_action_archetype.jac