diff --git a/client/src/containers/ListContainer.js b/client/src/containers/ListContainer.js
index c3d47a92..e96b0f3e 100755
--- a/client/src/containers/ListContainer.js
+++ b/client/src/containers/ListContainer.js
@@ -12,7 +12,7 @@ const makeMapStateToProps = () => {
 
   return (state, { id, index }) => {
     const { name, isPersisted } = selectListById(state, id);
-    const [cardIds, cardIdsFull, isFiltered] = selectCardIdsByListId(state, id);
+    const { cardIds, cardIdsFull, isFiltered } = selectCardIdsByListId(state, id);
     const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
 
     const isCurrentUserEditor =
diff --git a/client/src/models/List.js b/client/src/models/List.js
index 7fbef26b..0e7e45e8 100755
--- a/client/src/models/List.js
+++ b/client/src/models/List.js
@@ -91,6 +91,7 @@ export default class extends BaseModel {
     const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);
     const filterLabelIds = this.board.filterLabels.toRefArray().map((label) => label.id);
     let isFiltered = false;
+
     if (filterUserIds.length > 0) {
       cardModels = cardModels.filter((cardModel) => {
         const users = cardModel.users.toRefArray();
@@ -107,7 +108,7 @@ export default class extends BaseModel {
       });
     }
 
-    return [cardModels, cardModelsFull, isFiltered];
+    return { cardModels, cardModelsFull, isFiltered };
   }
 
   deleteRelated() {
diff --git a/client/src/selectors/core.js b/client/src/selectors/core.js
index 0ae4663b..65099d36 100755
--- a/client/src/selectors/core.js
+++ b/client/src/selectors/core.js
@@ -93,7 +93,8 @@ export const selectNextCardPosition = createSelector(
       return listModel;
     }
 
-    return nextPosition(listModel.getFilteredOrderedCardsModelArray(), index, excludedId);
+    // eslint-disable-next-line prettier/prettier
+    return nextPosition(listModel.getFilteredOrderedCardsModelArray().cardModels, index, excludedId);
   },
 );
 
diff --git a/client/src/selectors/lists.js b/client/src/selectors/lists.js
index 29690dce..4ab0abfb 100644
--- a/client/src/selectors/lists.js
+++ b/client/src/selectors/lists.js
@@ -33,12 +33,13 @@ export const makeSelectCardIdsByListId = () =>
       if (!listModel) {
         return listModel;
       }
+
       const cardsModelArray = listModel.getFilteredOrderedCardsModelArray();
-      return [
-        cardsModelArray[0].map((cardModel) => cardModel.id),
-        cardsModelArray[1].map((cardModel) => cardModel.id),
-        cardsModelArray[2],
-      ];
+      return {
+        cardIds: cardsModelArray.cardModels.map((cardModel) => cardModel.id),
+        cardIdsFull: cardsModelArray.cardModelsFull.map((cardModel) => cardModel.id),
+        isFiltered: cardsModelArray.isFiltered,
+      };
     },
   );