diff --git a/src/components/molecules/MovieList/index.tsx b/src/components/molecules/MovieList/index.tsx
index d588eb5..636d951 100644
--- a/src/components/molecules/MovieList/index.tsx
+++ b/src/components/molecules/MovieList/index.tsx
@@ -152,19 +152,31 @@ export const MovieList: FC<Props> = ({
               Ulubione ({movies.filter((movie) => movie.favorite).length})
             </Label>
             <Label
-              active={filter.seen !== undefined}
+              active={
+                filter.seen !== undefined && filter.released === undefined
+              }
               onClick={() => handleFilter("seen")}
             >
               Obejrzane ({movies.filter((movie) => movie.seen).length})
             </Label>
             <Label
-              active={filter.released !== undefined}
-              onClick={() => handleFilter("released")}
+              active={
+                filter.released !== undefined && filter.seen !== undefined
+              }
+              onClick={() =>
+                setFilter({
+                  seen: 0,
+                  released: 1,
+                  favorites: filterFavoritesInitial,
+                  upcoming: filterUpcomingInitial,
+                })
+              }
             >
-              W kinach (
+              Do obejrzenia (
               {
                 movies.filter(
-                  (movie) => new Date(movie.release_date) < new Date()
+                  (movie) =>
+                    new Date(movie.release_date) < new Date() && !movie.seen
                 ).length
               }
               )
diff --git a/src/components/molecules/TrackedMovies/index.tsx b/src/components/molecules/TrackedMovies/index.tsx
index 7cb2bed..cd22297 100644
--- a/src/components/molecules/TrackedMovies/index.tsx
+++ b/src/components/molecules/TrackedMovies/index.tsx
@@ -27,9 +27,17 @@ export const TrackedMovies: FC<Props> = ({
   }
 
   const today = new Date();
-  const upcoming = movies.filter(
-    (movie) => new Date(movie.release_date) > today
-  );
+  const upcoming = movies.filter((movie) => {
+    const daysSinceRelease = Math.abs(
+      Math.floor(
+        (new Date().getTime() - new Date(movie.release_date).getTime()) /
+          (1000 * 60 * 60 * 24)
+      )
+    );
+    return (
+      new Date(movie.release_date) > today && daysSinceRelease <= daysLimit
+    );
+  });
   const inCinema = movies.filter((movie) => {
     const daysSinceRelease = Math.floor(
       (new Date().getTime() - new Date(movie.release_date).getTime()) /