diff --git a/server/AyaNova/biz/EventLogProcessor.cs b/server/AyaNova/biz/EventLogProcessor.cs
index 94b94b7d..8346203c 100644
--- a/server/AyaNova/biz/EventLogProcessor.cs
+++ b/server/AyaNova/biz/EventLogProcessor.cs
@@ -19,6 +19,8 @@ namespace AyaNova.Biz
         /// <returns></returns>
         internal static async Task LogEventToDatabaseAsync(Event newEvent, AyContext ct)
         {
+            //System.Diagnostics.Debug.WriteLine($"Event log event for {newEvent.AyId}:{newEvent.AyType} {newEvent.AyEvent} {newEvent.Created}");
+
             await ct.Event.AddAsync(newEvent);
             await ct.SaveChangesAsync();
         }
@@ -54,7 +56,7 @@ namespace AyaNova.Biz
 
             //Set up the query
             var q = ct.Event.Select(m => m).Skip(offset).Take(limit).AsNoTracking();
-            q = q.Where(m => m.AyId == opt.AyId);
+            q = q.Where(m => m.AyId == opt.AyId && m.AyType== opt.AyType);
             q = q.OrderByDescending(m => m.Created);
             q = q.Skip(offset).Take(limit);