diff --git a/app/src/Lib/Traits/IndexQueryTrait.php b/app/src/Lib/Traits/IndexQueryTrait.php
index ad784d451..7771bbeb0 100644
--- a/app/src/Lib/Traits/IndexQueryTrait.php
+++ b/app/src/Lib/Traits/IndexQueryTrait.php
@@ -224,11 +224,13 @@ public function getIndexQuery(bool $pickerMode = false, array $requestParams = [
       $query = $query->where(fn(QueryExpression $exp, Query $query) => $exp->in($table->getAlias().'.status', [StatusEnum::Active, StatusEnum::GracePeriod]));
 
       // Specific expressions per view
-      $query = match($requestParams['for'] ?? '') {
+      $query = match(true) {
         // GroupMembers Add view: We need to filter the active members
-        'GroupMembers' => $query->leftJoinWith('GroupMembers', fn($q) => $q->where(['GroupMembers.group_id' => (int)($requestParams['group_id'] ?? -1)]))
-                                ->where($this->getTableLocator()->get('GroupMembers')->checkValidity($query))
-                                ->where(fn(QueryExpression $exp, Query $query) => $exp->isNull('GroupMembers.' . StringUtilities::classNameToForeignKey($table->getAlias()))),
+        (isset($requestParams['group_id']) && $modelsName === 'People') => $query
+          ->leftJoinWith('GroupMembers', fn($q) => $q->where(['GroupMembers.group_id' => (int)($requestParams['group_id'] ?? -1)])),
+//   XXX We want to get both members and not members. The frontend will handle the rest
+//        ->where($this->getTableLocator()->get('GroupMembers')->checkValidity($query))
+//        ->where(fn(QueryExpression $exp, Query $query) => $exp->isNull('GroupMembers.' . StringUtilities::classNameToForeignKey($table->getAlias()))),
         // Just return the query
         default => $query
       };
diff --git a/app/templates/GroupMembers/columns.inc b/app/templates/GroupMembers/columns.inc
index a9674af44..abd2f1c7f 100644
--- a/app/templates/GroupMembers/columns.inc
+++ b/app/templates/GroupMembers/columns.inc
@@ -100,7 +100,6 @@ $subnav = [
 $peoplePicker = [
   'label' => __d('operation','add.member'),
   'viewConfigParameters' => [
-    'for' => 'GroupMembers',
     'groupId' => $this->getRequest()?->getQuery('group_id')
   ],
   'actionUrl' => [
diff --git a/app/templates/element/peopleAutocomplete.php b/app/templates/element/peopleAutocomplete.php
index 97462f730..7787bbf36 100644
--- a/app/templates/element/peopleAutocomplete.php
+++ b/app/templates/element/peopleAutocomplete.php
@@ -68,7 +68,7 @@
       viewConfigParameters: <?= json_encode($viewConfigParameters) ?>,
       webroot: '<?= $this->request->getAttribute('webroot') ?>',
       // co_id query parameter is required since it is the People's primary link
-      searchPeople: `<?= $this->request->getAttribute('webroot') ?>api/ajax/v2/people/pick?co_id=<?= $vv_cur_co->id ?>&for=<?= $viewConfigParameters['for'] ?>`
+      searchPeople: `<?= $this->request->getAttribute('webroot') ?>api/ajax/v2/people/pick?co_id=<?= $vv_cur_co->id ?>`
     }
   }