diff --git a/server/AyaNova/biz/EventLogProcessor.cs b/server/AyaNova/biz/EventLogProcessor.cs
index a4138cd8..29d4817c 100644
--- a/server/AyaNova/biz/EventLogProcessor.cs
+++ b/server/AyaNova/biz/EventLogProcessor.cs
@@ -55,8 +55,8 @@ namespace AyaNova.Biz
             var limit = opt.Limit ?? DEFAULT_EVENT_LIMIT;
             var offset = opt.Offset ?? 0;
 
-            //Set up the query
-            var q = ct.Event.Select(m => m).Skip(offset).Take(limit).AsNoTracking();
+            //Set up the query       
+            var q = ct.Event.Select(m => m).AsNoTracking();
             q = q.Where(m => m.AyId == opt.AyId && m.AyType == opt.AyType);
             q = q.OrderByDescending(m => m.Created);
             q = q.Skip(offset).Take(limit);
@@ -95,9 +95,14 @@ namespace AyaNova.Biz
             var limit = opt.Limit ?? DEFAULT_EVENT_LIMIT;
             var offset = opt.Offset ?? 0;
             //Set up the query
-            var q = ct.Event.Select(m => m).Skip(offset).Take(limit).AsNoTracking();
+            // var q = ct.Event.Select(m => m).Skip(offset).Take(limit).AsNoTracking();
+            // q = q.Where(m => m.UserId == opt.UserId);
+            // q = q.OrderByDescending(m => m.Created);
+
+            var q = ct.Event.Select(m => m).AsNoTracking();
             q = q.Where(m => m.UserId == opt.UserId);
             q = q.OrderByDescending(m => m.Created);
+            q = q.Skip(offset).Take(limit);
 
 
             //Execute the query
@@ -139,13 +144,13 @@ namespace AyaNova.Biz
             await EventLogProcessor.LogEventToDatabaseAsync(new Event(ev.Creator, ev.AyId, ev.AyType, AyaEvent.Created, ev.Created, null), ct);
 
             //MODIFIED
-            await EventLogProcessor.LogEventToDatabaseAsync(new Event(ev.Modifier,ev.AyId, ev.AyType, AyaEvent.Modified, ev.Modified, null), ct);
+            await EventLogProcessor.LogEventToDatabaseAsync(new Event(ev.Modifier, ev.AyId, ev.AyType, AyaEvent.Modified, ev.Modified, null), ct);
 
 
             await ct.SaveChangesAsync();
         }
 
-       
+
 
         /////////////////////////////////////////////////////////////////////