diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index ef3a084c..b3a7090c 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -330,15 +330,15 @@ namespace AyaNova.Biz
             if (TheFilter != null)
             {
                 qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
-                qTotalRecordsQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
+                qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom} {qWhere}";
             }
             else
             {
                 qDataQuery = $"{qSelectColumns} {qFrom} {qLimitOffset}";
-                qTotalRecordsQuery = $"{qSelectColumns} {qFrom} {qLimitOffset}";
+                qTotalRecordsQuery = $"SELECT COUNT(*) {qFrom}";
             }
 
-
+            //SELECT COUNT(*) FROM AWIDGET 
             //RETURN OBJECTS
             List<object[]> items = new List<object[]>();
             long totalRecordCount = 0;
@@ -362,7 +362,11 @@ namespace AyaNova.Biz
                 command.CommandText = qTotalRecordsQuery;
                 using (var dr = command.ExecuteReader())
                 {
-                    dr.Read();
+                    if (dr.Read())
+                    {
+                        totalRecordCount = dr.GetInt64(0);
+                    }
+
                     // {
                     //     object[] row = new object[dr.FieldCount];
                     //     dr.GetValues(row);