diff --git a/src/Twig/Components/TvEpisodeList.php b/src/Twig/Components/TvEpisodeList.php
index 43cc60a..33ff44f 100644
--- a/src/Twig/Components/TvEpisodeList.php
+++ b/src/Twig/Components/TvEpisodeList.php
@@ -10,7 +10,7 @@ use Symfony\UX\LiveComponent\Attribute\LiveProp;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
 #[AsLiveComponent]
-final class TvEpisodeList
+final class  TvEpisodeList
 {
     use DefaultActionTrait;
     use PaginateTrait;
diff --git a/templates/components/Filter.html.twig b/templates/components/Filter.html.twig
index 345aae1..137083c 100644
--- a/templates/components/Filter.html.twig
+++ b/templates/components/Filter.html.twig
@@ -73,18 +73,15 @@
                         {{ stimulus_action('result_filter', 'setSeason', 'change') }}
                         {{ stimulus_action('result_filter', 'uncheckSelectAllBtn', 'change') }}
                 >
-                    <option selected value="1">1</option>
-                    {% for season in range(2, results.media.episodes|length) %}
-                        <option value="{{ season }}">{{ season }}</option>
+                    {% for season in range(1, results.media.episodes|length) %}
+                        <option value="{{ season }}"
+                            {% if results.season == season %}
+                                selected="selected"
+                            {% endif %}
+                        >{{ season }}</option>
                     {% endfor %}
                 </select>
             </label>
-            {#                        <label for="episodeNumber">#}
-            {#                            Episode#}
-            {#                            <select id="episodeNumber" name="episodeNumber" data-result-filter-target="episode" class="px-1 py-0.5 bg-stone-100 text-gray-800 rounded-sm">#}
-            {#                                <option selected value="">n/a</option>#}
-            {#                            </select>#}
-            {#                        </label>#}
         {% endif %}
         <span {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }}
             class="loading-icon">