diff --git a/README.md b/README.md
index 8b5f9a4..e670a38 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ You can download the app [here](https://github.com/ReStartQ/AniCour/releases). C
 
 1. Download the setup file from the latest release and install it on your computer.
 2. The setup file is labeled as AniCour-Setup-x.x.x.exe, where x denotes a number for the version.
-   <br/> **Ex**: AniCour-Setup-1.2.0.exe
+   <br/> **Ex**: AniCour-Setup-1.3.0.exe
    <br /> **_Note: Some browsers may give a warning when you download this setup file as it does not have a code signing certificate._**
 3. Use the app to track, search, and manage your anime, manga, and light novels.
 
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index c07c250..3235eea 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "anicour",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "anicour",
-      "version": "1.2.0",
+      "version": "1.3.0",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     }
diff --git a/release/app/package.json b/release/app/package.json
index 23ed8ad..a5b7d4a 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anicour",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Anime, Manga, and Light Novel Tracker Desktop Application for Windows. A fast and interactive way for AniList users to track and manage their anime/manga lists. ",
   "license": "GPL-3.0",
   "author": {
diff --git a/src/renderer/components/app/test/MediaTable.tsx b/src/renderer/components/app/test/MediaTable.tsx
index c69cbfb..77f4934 100644
--- a/src/renderer/components/app/test/MediaTable.tsx
+++ b/src/renderer/components/app/test/MediaTable.tsx
@@ -18,7 +18,6 @@ import Typography from '@mui/material/Typography';
 import { alpha } from '@mui/material/styles';
 import { visuallyHidden } from '@mui/utils';
 import * as React from 'react';
-import { useMain } from 'renderer/context/MainContext';
 
 interface Data {
   calories: number;
@@ -169,8 +168,6 @@ function EnhancedTableHead(props: EnhancedTableProps) {
       onRequestSort(event, property);
     };
 
-  const mainCards: any = useMain();
-
   return (
     <TableHead>
       <TableRow>
diff --git a/src/renderer/components/settings/SettingsMain.tsx b/src/renderer/components/settings/SettingsMain.tsx
index 232a9ef..7bd5524 100644
--- a/src/renderer/components/settings/SettingsMain.tsx
+++ b/src/renderer/components/settings/SettingsMain.tsx
@@ -6,7 +6,6 @@ import { keyframes } from '@emotion/react';
 import { useQuery } from '@tanstack/react-query';
 import Axios from 'axios';
 import { useMainView } from '../../context/MainViewContext';
-import { MainContext, useMain } from '../../context/MainContext';
 import SelectLanguage from './lang/SelectLanguage';
 import SelectTheme from './theme/SelectTheme';
 import ThemeToggle from './theme/ThemeToggle';
@@ -79,7 +78,6 @@ function SettingsMainTab({ view }: any) {
 }
 
 export default function SettingsMain({ props }: any) {
-  const mainCards: any = useMain();
   const mainView: any = useMainView();
   const sidebarValue: any = useSidebarButton();
   const myFilter: any = useFilter();
@@ -87,7 +85,5 @@ export default function SettingsMain({ props }: any) {
   const [end, setEnd] = useState(48);
   const [more, setMore] = useState(true);
 
-  console.log(mainCards);
-
   return <SettingsMainTab view={sidebarValue.sidebar} />;
 }
diff --git a/src/renderer/functions/MainMediaListFunctions.tsx b/src/renderer/functions/MainMediaListFunctions.tsx
index 03ea1aa..6841024 100644
--- a/src/renderer/functions/MainMediaListFunctions.tsx
+++ b/src/renderer/functions/MainMediaListFunctions.tsx
@@ -139,12 +139,13 @@ export const useMainMediaList = (myUserName: string, myToken: string) =>
         key: entry.title.romaji + index,
       })); */
 
-      let animeWatchingIndex = 0;
-      let animeCompletedIndex = 0;
-      let animeOnHoldIndex = 0;
-      let animeDroppedIndex = 0;
-      let animePlanToWatchIndex = 0;
+      let animeWatchingIndex = null;
+      let animeCompletedIndex = null;
+      let animeOnHoldIndex = null;
+      let animeDroppedIndex = null;
+      let animePlanToWatchIndex = null;
 
+      // sets the indexes
       // eslint-disable-next-line no-plusplus
       for (let i = 0; i < myQuery.length; i++) {
         if (
@@ -283,7 +284,7 @@ export const useMainMediaList = (myUserName: string, myToken: string) =>
               }
           `,
           variables: {
-            userName: 'ReStart',
+            userName: myUserName,
           },
         },
         headers,
@@ -291,271 +292,286 @@ export const useMainMediaList = (myUserName: string, myToken: string) =>
 
       const myObject: any = {
         anime: {
-          animeWatching: await myQuery[animeWatchingIndex].entries.map(
-            (entry: any, index: any) => ({
-              id: entry.media.id,
-              idMal: entry.media.idMal,
-              private: entry.private,
-              titleRomaji: entry.media.title.romaji,
-              titleEnglish: entry.media.title.english,
-              titleNative: entry.media.title.native,
-              synonyms: entry.media.synonyms,
-              season: entry.media.season,
-              seasonYear: entry.media.seasonYear,
-              episodes: entry.media.episodes,
-              chapters: entry.media.chapters,
-              volumes: entry.media.volumes,
-              type: entry.media.type,
-              format: entry.media.format,
-              image: entry.media.coverImage.large,
-              imageMedium: entry.media.coverImage.medium,
-              imageExtraLarge: entry.media.coverImage.extraLarge,
-              bannerImage: entry.media.bannerImage,
-              startYear: entry.media.startDate.year,
-              startMonth: entry.media.startDate.month,
-              startDay: entry.media.startDate.day,
-              description: entry.media.description,
-              genres: entry.media.genres,
-              tags: entry.media.tags,
-              status: entry.media.status,
-              siteUrl: entry.media.siteUrl,
-              duration: entry.media.duration,
-              averageScore: entry.media.averageScore,
-              popularity: entry.media.popularity,
-              studios: entry.media.studios.edges,
-              mainStudioIndex: entry.media.studios.edges
-                .map((e: any) => {
-                  return e.isMain;
-                })
-                .indexOf(true),
-              source: entry.media.source,
-              meanScore: entry.media.meanScore,
-              mediaListEntry: entry.media.mediaListEntry,
-              progress: entry.media.mediaListEntry.progress,
-              progressVolumes: entry.media.mediaListEntry.progressVolumes,
-              score: entry.media.mediaListEntry.score,
-              notes: entry.media.mediaListEntry.notes,
-              startedAt: entry.media.mediaListEntry.startedAt,
-              completedAt: entry.media.mediaListEntry.completedAt,
-              repeat: entry.media.mediaListEntry.repeat,
-              trailer: entry.media.trailer,
-              nextAiringEpisode: entry.media.nextAiringEpisode,
-              location: 'animeWatching',
-              key: entry.media.title.romaji + entry.media.id,
-            }),
-          ),
-          animeCompleted: await myQuery[animeCompletedIndex].entries.map(
-            (entry: any, index: any) => ({
-              id: entry.media.id,
-              idMal: entry.media.idMal,
-              private: entry.private,
-              titleRomaji: entry.media.title.romaji,
-              titleEnglish: entry.media.title.english,
-              titleNative: entry.media.title.native,
-              synonyms: entry.media.synonyms,
-              season: entry.media.season,
-              seasonYear: entry.media.seasonYear,
-              episodes: entry.media.episodes,
-              chapters: entry.media.chapters,
-              volumes: entry.media.volumes,
-              type: entry.media.type,
-              format: entry.media.format,
-              image: entry.media.coverImage.large,
-              imageMedium: entry.media.coverImage.medium,
-              imageExtraLarge: entry.media.coverImage.extraLarge,
-              bannerImage: entry.media.bannerImage,
-              startYear: entry.media.startDate.year,
-              startMonth: entry.media.startDate.month,
-              startDay: entry.media.startDate.day,
-              description: entry.media.description,
-              genres: entry.media.genres,
-              tags: entry.media.tags,
-              status: entry.media.status,
-              siteUrl: entry.media.siteUrl,
-              duration: entry.media.duration,
-              averageScore: entry.media.averageScore,
-              popularity: entry.media.popularity,
-              studios: entry.media.studios.edges,
-              mainStudioIndex: entry.media.studios.edges
-                .map((e: any) => {
-                  return e.isMain;
-                })
-                .indexOf(true),
-              source: entry.media.source,
-              meanScore: entry.media.meanScore,
-              mediaListEntry: entry.media.mediaListEntry,
-              progress: entry.media.mediaListEntry.progress,
-              progressVolumes: entry.media.mediaListEntry.progressVolumes,
-              score: entry.media.mediaListEntry.score,
-              notes: entry.media.mediaListEntry.notes,
-              startedAt: entry.media.mediaListEntry.startedAt,
-              completedAt: entry.media.mediaListEntry.completedAt,
-              repeat: entry.media.mediaListEntry.repeat,
-              trailer: entry.media.trailer,
-              nextAiringEpisode: entry.media.nextAiringEpisode,
-              location: 'animeCompleted',
-              key: entry.media.title.romaji + entry.media.id,
-            }),
-          ),
-          animeOnHold: await myQuery[animeOnHoldIndex].entries.map(
-            (entry: any, index: any) => ({
-              id: entry.media.id,
-              idMal: entry.media.idMal,
-              private: entry.private,
-              titleRomaji: entry.media.title.romaji,
-              titleEnglish: entry.media.title.english,
-              titleNative: entry.media.title.native,
-              synonyms: entry.media.synonyms,
-              season: entry.media.season,
-              seasonYear: entry.media.seasonYear,
-              episodes: entry.media.episodes,
-              chapters: entry.media.chapters,
-              volumes: entry.media.volumes,
-              type: entry.media.type,
-              format: entry.media.format,
-              image: entry.media.coverImage.large,
-              imageMedium: entry.media.coverImage.medium,
-              imageExtraLarge: entry.media.coverImage.extraLarge,
-              bannerImage: entry.media.bannerImage,
-              startYear: entry.media.startDate.year,
-              startMonth: entry.media.startDate.month,
-              startDay: entry.media.startDate.day,
-              description: entry.media.description,
-              genres: entry.media.genres,
-              tags: entry.media.tags,
-              status: entry.media.status,
-              siteUrl: entry.media.siteUrl,
-              duration: entry.media.duration,
-              averageScore: entry.media.averageScore,
-              popularity: entry.media.popularity,
-              studios: entry.media.studios.edges,
-              mainStudioIndex: entry.media.studios.edges
-                .map((e: any) => {
-                  return e.isMain;
-                })
-                .indexOf(true),
-              source: entry.media.source,
-              meanScore: entry.media.meanScore,
-              mediaListEntry: entry.media.mediaListEntry,
-              progress: entry.media.mediaListEntry.progress,
-              progressVolumes: entry.media.mediaListEntry.progressVolumes,
-              score: entry.media.mediaListEntry.score,
-              notes: entry.media.mediaListEntry.notes,
-              startedAt: entry.media.mediaListEntry.startedAt,
-              completedAt: entry.media.mediaListEntry.completedAt,
-              repeat: entry.media.mediaListEntry.repeat,
-              trailer: entry.media.trailer,
-              nextAiringEpisode: entry.media.nextAiringEpisode,
-              location: 'animeOnHold',
-              key: entry.media.title.romaji + entry.media.id,
-            }),
-          ),
-          animeDropped: await myQuery[animeDroppedIndex].entries.map(
-            (entry: any, index: any) => ({
-              id: entry.media.id,
-              idMal: entry.media.idMal,
-              private: entry.private,
-              titleRomaji: entry.media.title.romaji,
-              titleEnglish: entry.media.title.english,
-              titleNative: entry.media.title.native,
-              synonyms: entry.media.synonyms,
-              season: entry.media.season,
-              seasonYear: entry.media.seasonYear,
-              episodes: entry.media.episodes,
-              chapters: entry.media.chapters,
-              volumes: entry.media.volumes,
-              type: entry.media.type,
-              format: entry.media.format,
-              image: entry.media.coverImage.large,
-              imageMedium: entry.media.coverImage.medium,
-              imageExtraLarge: entry.media.coverImage.extraLarge,
-              bannerImage: entry.media.bannerImage,
-              startYear: entry.media.startDate.year,
-              startMonth: entry.media.startDate.month,
-              startDay: entry.media.startDate.day,
-              description: entry.media.description,
-              genres: entry.media.genres,
-              tags: entry.media.tags,
-              status: entry.media.status,
-              siteUrl: entry.media.siteUrl,
-              duration: entry.media.duration,
-              averageScore: entry.media.averageScore,
-              popularity: entry.media.popularity,
-              studios: entry.media.studios.edges,
-              mainStudioIndex: entry.media.studios.edges
-                .map((e: any) => {
-                  return e.isMain;
-                })
-                .indexOf(true),
-              source: entry.media.source,
-              meanScore: entry.media.meanScore,
-              mediaListEntry: entry.media.mediaListEntry,
-              progress: entry.media.mediaListEntry.progress,
-              progressVolumes: entry.media.mediaListEntry.progressVolumes,
-              score: entry.media.mediaListEntry.score,
-              notes: entry.media.mediaListEntry.notes,
-              startedAt: entry.media.mediaListEntry.startedAt,
-              completedAt: entry.media.mediaListEntry.completedAt,
-              repeat: entry.media.mediaListEntry.repeat,
-              trailer: entry.media.trailer,
-              nextAiringEpisode: entry.media.nextAiringEpisode,
-              location: 'animeDropped',
-              key: entry.media.title.romaji + entry.media.id,
-            }),
-          ),
-          animePlanToWatch: await myQuery[animePlanToWatchIndex].entries.map(
-            (entry: any, index: any) => ({
-              id: entry.media.id,
-              idMal: entry.media.idMal,
-              private: entry.private,
-              titleRomaji: entry.media.title.romaji,
-              titleEnglish: entry.media.title.english,
-              titleNative: entry.media.title.native,
-              synonyms: entry.media.synonyms,
-              season: entry.media.season,
-              seasonYear: entry.media.seasonYear,
-              episodes: entry.media.episodes,
-              chapters: entry.media.chapters,
-              volumes: entry.media.volumes,
-              type: entry.media.type,
-              format: entry.media.format,
-              image: entry.media.coverImage.large,
-              imageMedium: entry.media.coverImage.medium,
-              imageExtraLarge: entry.media.coverImage.extraLarge,
-              bannerImage: entry.media.bannerImage,
-              startYear: entry.media.startDate.year,
-              startMonth: entry.media.startDate.month,
-              startDay: entry.media.startDate.day,
-              description: entry.media.description,
-              genres: entry.media.genres,
-              tags: entry.media.tags,
-              status: entry.media.status,
-              siteUrl: entry.media.siteUrl,
-              duration: entry.media.duration,
-              averageScore: entry.media.averageScore,
-              popularity: entry.media.popularity,
-              studios: entry.media.studios.edges,
-              mainStudioIndex: entry.media.studios.edges
-                .map((e: any) => {
-                  return e.isMain;
-                })
-                .indexOf(true),
-              source: entry.media.source,
-              meanScore: entry.media.meanScore,
-              mediaListEntry: entry.media.mediaListEntry,
-              progress: entry.media.mediaListEntry.progress,
-              progressVolumes: entry.media.mediaListEntry.progressVolumes,
-              score: entry.media.mediaListEntry.score,
-              notes: entry.media.mediaListEntry.notes,
-              startedAt: entry.media.mediaListEntry.startedAt,
-              completedAt: entry.media.mediaListEntry.completedAt,
-              repeat: entry.media.mediaListEntry.repeat,
-              trailer: entry.media.trailer,
-              nextAiringEpisode: entry.media.nextAiringEpisode,
-              location: 'animePlanToWatch',
-              key: entry.media.title.romaji + entry.media.id,
-            }),
-          ),
+          animeWatching:
+            animeWatchingIndex !== null
+              ? await myQuery[animeWatchingIndex].entries.map(
+                  (entry: any, index: any) => ({
+                    id: entry.media.id,
+                    idMal: entry.media.idMal,
+                    private: entry.private,
+                    titleRomaji: entry.media.title.romaji,
+                    titleEnglish: entry.media.title.english,
+                    titleNative: entry.media.title.native,
+                    synonyms: entry.media.synonyms,
+                    season: entry.media.season,
+                    seasonYear: entry.media.seasonYear,
+                    episodes: entry.media.episodes,
+                    chapters: entry.media.chapters,
+                    volumes: entry.media.volumes,
+                    type: entry.media.type,
+                    format: entry.media.format,
+                    image: entry.media.coverImage.large,
+                    imageMedium: entry.media.coverImage.medium,
+                    imageExtraLarge: entry.media.coverImage.extraLarge,
+                    bannerImage: entry.media.bannerImage,
+                    startYear: entry.media.startDate.year,
+                    startMonth: entry.media.startDate.month,
+                    startDay: entry.media.startDate.day,
+                    description: entry.media.description,
+                    genres: entry.media.genres,
+                    tags: entry.media.tags,
+                    status: entry.media.status,
+                    siteUrl: entry.media.siteUrl,
+                    duration: entry.media.duration,
+                    averageScore: entry.media.averageScore,
+                    popularity: entry.media.popularity,
+                    studios: entry.media.studios.edges,
+                    mainStudioIndex: entry.media.studios.edges
+                      .map((e: any) => {
+                        return e.isMain;
+                      })
+                      .indexOf(true),
+                    source: entry.media.source,
+                    meanScore: entry.media.meanScore,
+                    mediaListEntry: entry.media.mediaListEntry,
+                    progress: entry.media.mediaListEntry.progress,
+                    progressVolumes: entry.media.mediaListEntry.progressVolumes,
+                    score: entry.media.mediaListEntry.score,
+                    notes: entry.media.mediaListEntry.notes,
+                    startedAt: entry.media.mediaListEntry.startedAt,
+                    completedAt: entry.media.mediaListEntry.completedAt,
+                    repeat: entry.media.mediaListEntry.repeat,
+                    trailer: entry.media.trailer,
+                    nextAiringEpisode: entry.media.nextAiringEpisode,
+                    location: 'animeWatching',
+                    key: entry.media.title.romaji + entry.media.id,
+                  }),
+                )
+              : [],
+          animeCompleted:
+            animeCompletedIndex !== null
+              ? await myQuery[animeCompletedIndex].entries.map(
+                  (entry: any, index: any) => ({
+                    id: entry.media.id,
+                    idMal: entry.media.idMal,
+                    private: entry.private,
+                    titleRomaji: entry.media.title.romaji,
+                    titleEnglish: entry.media.title.english,
+                    titleNative: entry.media.title.native,
+                    synonyms: entry.media.synonyms,
+                    season: entry.media.season,
+                    seasonYear: entry.media.seasonYear,
+                    episodes: entry.media.episodes,
+                    chapters: entry.media.chapters,
+                    volumes: entry.media.volumes,
+                    type: entry.media.type,
+                    format: entry.media.format,
+                    image: entry.media.coverImage.large,
+                    imageMedium: entry.media.coverImage.medium,
+                    imageExtraLarge: entry.media.coverImage.extraLarge,
+                    bannerImage: entry.media.bannerImage,
+                    startYear: entry.media.startDate.year,
+                    startMonth: entry.media.startDate.month,
+                    startDay: entry.media.startDate.day,
+                    description: entry.media.description,
+                    genres: entry.media.genres,
+                    tags: entry.media.tags,
+                    status: entry.media.status,
+                    siteUrl: entry.media.siteUrl,
+                    duration: entry.media.duration,
+                    averageScore: entry.media.averageScore,
+                    popularity: entry.media.popularity,
+                    studios: entry.media.studios.edges,
+                    mainStudioIndex: entry.media.studios.edges
+                      .map((e: any) => {
+                        return e.isMain;
+                      })
+                      .indexOf(true),
+                    source: entry.media.source,
+                    meanScore: entry.media.meanScore,
+                    mediaListEntry: entry.media.mediaListEntry,
+                    progress: entry.media.mediaListEntry.progress,
+                    progressVolumes: entry.media.mediaListEntry.progressVolumes,
+                    score: entry.media.mediaListEntry.score,
+                    notes: entry.media.mediaListEntry.notes,
+                    startedAt: entry.media.mediaListEntry.startedAt,
+                    completedAt: entry.media.mediaListEntry.completedAt,
+                    repeat: entry.media.mediaListEntry.repeat,
+                    trailer: entry.media.trailer,
+                    nextAiringEpisode: entry.media.nextAiringEpisode,
+                    location: 'animeCompleted',
+                    key: entry.media.title.romaji + entry.media.id,
+                  }),
+                )
+              : [],
+          animeOnHold:
+            animeOnHoldIndex !== null
+              ? await myQuery[animeOnHoldIndex].entries.map(
+                  (entry: any, index: any) => ({
+                    id: entry.media.id,
+                    idMal: entry.media.idMal,
+                    private: entry.private,
+                    titleRomaji: entry.media.title.romaji,
+                    titleEnglish: entry.media.title.english,
+                    titleNative: entry.media.title.native,
+                    synonyms: entry.media.synonyms,
+                    season: entry.media.season,
+                    seasonYear: entry.media.seasonYear,
+                    episodes: entry.media.episodes,
+                    chapters: entry.media.chapters,
+                    volumes: entry.media.volumes,
+                    type: entry.media.type,
+                    format: entry.media.format,
+                    image: entry.media.coverImage.large,
+                    imageMedium: entry.media.coverImage.medium,
+                    imageExtraLarge: entry.media.coverImage.extraLarge,
+                    bannerImage: entry.media.bannerImage,
+                    startYear: entry.media.startDate.year,
+                    startMonth: entry.media.startDate.month,
+                    startDay: entry.media.startDate.day,
+                    description: entry.media.description,
+                    genres: entry.media.genres,
+                    tags: entry.media.tags,
+                    status: entry.media.status,
+                    siteUrl: entry.media.siteUrl,
+                    duration: entry.media.duration,
+                    averageScore: entry.media.averageScore,
+                    popularity: entry.media.popularity,
+                    studios: entry.media.studios.edges,
+                    mainStudioIndex: entry.media.studios.edges
+                      .map((e: any) => {
+                        return e.isMain;
+                      })
+                      .indexOf(true),
+                    source: entry.media.source,
+                    meanScore: entry.media.meanScore,
+                    mediaListEntry: entry.media.mediaListEntry,
+                    progress: entry.media.mediaListEntry.progress,
+                    progressVolumes: entry.media.mediaListEntry.progressVolumes,
+                    score: entry.media.mediaListEntry.score,
+                    notes: entry.media.mediaListEntry.notes,
+                    startedAt: entry.media.mediaListEntry.startedAt,
+                    completedAt: entry.media.mediaListEntry.completedAt,
+                    repeat: entry.media.mediaListEntry.repeat,
+                    trailer: entry.media.trailer,
+                    nextAiringEpisode: entry.media.nextAiringEpisode,
+                    location: 'animeOnHold',
+                    key: entry.media.title.romaji + entry.media.id,
+                  }),
+                )
+              : [],
+          animeDropped:
+            animeDroppedIndex !== null
+              ? await myQuery[animeDroppedIndex].entries.map(
+                  (entry: any, index: any) => ({
+                    id: entry.media.id,
+                    idMal: entry.media.idMal,
+                    private: entry.private,
+                    titleRomaji: entry.media.title.romaji,
+                    titleEnglish: entry.media.title.english,
+                    titleNative: entry.media.title.native,
+                    synonyms: entry.media.synonyms,
+                    season: entry.media.season,
+                    seasonYear: entry.media.seasonYear,
+                    episodes: entry.media.episodes,
+                    chapters: entry.media.chapters,
+                    volumes: entry.media.volumes,
+                    type: entry.media.type,
+                    format: entry.media.format,
+                    image: entry.media.coverImage.large,
+                    imageMedium: entry.media.coverImage.medium,
+                    imageExtraLarge: entry.media.coverImage.extraLarge,
+                    bannerImage: entry.media.bannerImage,
+                    startYear: entry.media.startDate.year,
+                    startMonth: entry.media.startDate.month,
+                    startDay: entry.media.startDate.day,
+                    description: entry.media.description,
+                    genres: entry.media.genres,
+                    tags: entry.media.tags,
+                    status: entry.media.status,
+                    siteUrl: entry.media.siteUrl,
+                    duration: entry.media.duration,
+                    averageScore: entry.media.averageScore,
+                    popularity: entry.media.popularity,
+                    studios: entry.media.studios.edges,
+                    mainStudioIndex: entry.media.studios.edges
+                      .map((e: any) => {
+                        return e.isMain;
+                      })
+                      .indexOf(true),
+                    source: entry.media.source,
+                    meanScore: entry.media.meanScore,
+                    mediaListEntry: entry.media.mediaListEntry,
+                    progress: entry.media.mediaListEntry.progress,
+                    progressVolumes: entry.media.mediaListEntry.progressVolumes,
+                    score: entry.media.mediaListEntry.score,
+                    notes: entry.media.mediaListEntry.notes,
+                    startedAt: entry.media.mediaListEntry.startedAt,
+                    completedAt: entry.media.mediaListEntry.completedAt,
+                    repeat: entry.media.mediaListEntry.repeat,
+                    trailer: entry.media.trailer,
+                    nextAiringEpisode: entry.media.nextAiringEpisode,
+                    location: 'animeDropped',
+                    key: entry.media.title.romaji + entry.media.id,
+                  }),
+                )
+              : [],
+          animePlanToWatch:
+            animePlanToWatchIndex !== null
+              ? await myQuery[animePlanToWatchIndex].entries.map(
+                  (entry: any, index: any) => ({
+                    id: entry.media.id,
+                    idMal: entry.media.idMal,
+                    private: entry.private,
+                    titleRomaji: entry.media.title.romaji,
+                    titleEnglish: entry.media.title.english,
+                    titleNative: entry.media.title.native,
+                    synonyms: entry.media.synonyms,
+                    season: entry.media.season,
+                    seasonYear: entry.media.seasonYear,
+                    episodes: entry.media.episodes,
+                    chapters: entry.media.chapters,
+                    volumes: entry.media.volumes,
+                    type: entry.media.type,
+                    format: entry.media.format,
+                    image: entry.media.coverImage.large,
+                    imageMedium: entry.media.coverImage.medium,
+                    imageExtraLarge: entry.media.coverImage.extraLarge,
+                    bannerImage: entry.media.bannerImage,
+                    startYear: entry.media.startDate.year,
+                    startMonth: entry.media.startDate.month,
+                    startDay: entry.media.startDate.day,
+                    description: entry.media.description,
+                    genres: entry.media.genres,
+                    tags: entry.media.tags,
+                    status: entry.media.status,
+                    siteUrl: entry.media.siteUrl,
+                    duration: entry.media.duration,
+                    averageScore: entry.media.averageScore,
+                    popularity: entry.media.popularity,
+                    studios: entry.media.studios.edges,
+                    mainStudioIndex: entry.media.studios.edges
+                      .map((e: any) => {
+                        return e.isMain;
+                      })
+                      .indexOf(true),
+                    source: entry.media.source,
+                    meanScore: entry.media.meanScore,
+                    mediaListEntry: entry.media.mediaListEntry,
+                    progress: entry.media.mediaListEntry.progress,
+                    progressVolumes: entry.media.mediaListEntry.progressVolumes,
+                    score: entry.media.mediaListEntry.score,
+                    notes: entry.media.mediaListEntry.notes,
+                    startedAt: entry.media.mediaListEntry.startedAt,
+                    completedAt: entry.media.mediaListEntry.completedAt,
+                    repeat: entry.media.mediaListEntry.repeat,
+                    trailer: entry.media.trailer,
+                    nextAiringEpisode: entry.media.nextAiringEpisode,
+                    location: 'animePlanToWatch',
+                    key: entry.media.title.romaji + entry.media.id,
+                  }),
+                )
+              : [],
           animeAll: [],
         },
         manga: {
@@ -577,11 +593,11 @@ export const useMainMediaList = (myUserName: string, myToken: string) =>
       };
 
       console.log(myQueryManga);
-      let mangaQueryReadingIndex = 0;
-      let mangaQueryCompletedIndex = 0;
-      let mangaQueryPlanToReadIndex = 0;
-      let mangaQueryDroppedIndex = 0;
-      let mangaQueryOnHoldIndex = 0;
+      let mangaQueryReadingIndex = null;
+      let mangaQueryCompletedIndex = null;
+      let mangaQueryPlanToReadIndex = null;
+      let mangaQueryDroppedIndex = null;
+      let mangaQueryOnHoldIndex = null;
 
       // eslint-disable-next-line no-plusplus
       for (let i = 0; i < myQueryManga.length; i++) {