diff --git a/core/components/formit/processors/mgr/encryption/getlist.class.php b/core/components/formit/processors/mgr/encryption/getlist.class.php
index a4c7df9..cb1fce5 100644
--- a/core/components/formit/processors/mgr/encryption/getlist.class.php
+++ b/core/components/formit/processors/mgr/encryption/getlist.class.php
@@ -72,9 +72,9 @@ public function prepareQueryBeforeCount(xPDOQuery $criteria)
             );
         }
 
+        $criteria->select('MIN(id) AS id, form, context_key');
         $criteria->groupby('form');
         $criteria->groupby('context_key');
-        $criteria->groupby('id');
 
         return $criteria;
     }
@@ -87,7 +87,7 @@ public function prepareQueryBeforeCount(xPDOQuery $criteria)
     public function prepareRow(xPDOObject $object)
     {
         return array_merge(
-            $object->toArray(), [
+            $object->toArray('', false, true), [
             'encrypted'     => $this->modx->getCount(
                 $this->classKey, [
                 'form'          => $object->get('form'),
diff --git a/core/components/formit/processors/mgr/forms/getforms.class.php b/core/components/formit/processors/mgr/forms/getforms.class.php
index c30f095..77b6295 100644
--- a/core/components/formit/processors/mgr/forms/getforms.class.php
+++ b/core/components/formit/processors/mgr/forms/getforms.class.php
@@ -64,6 +64,7 @@ public function prepareQueryBeforeCount(xPDOQuery $criteria)
             'context_key:IN' => $this->getAvailableContexts()
         ]);
 
+        $criteria->select('MIN(id) AS id, form');
         $criteria->groupby('form');
 
         return $criteria;
@@ -76,7 +77,7 @@ public function prepareQueryBeforeCount(xPDOQuery $criteria)
      */
     public function prepareRow(xPDOObject $object)
     {
-        return $object->toArray();
+        return $object->toArray('', false, true);
     }
 
     /**