diff --git a/assets/controllers/result_filter_controller.js b/assets/controllers/result_filter_controller.js
index 3862263..c8b0280 100644
--- a/assets/controllers/result_filter_controller.js
+++ b/assets/controllers/result_filter_controller.js
@@ -148,7 +148,7 @@ export default class extends Controller {
                 } else if (true === firstIncluded) {
                     count = 1;
                     selectedCount = selectedCount + 1;
-                    // option.selectInput.checked = true;
+                    option.querySelector('input[type="checkbox"]').checked = true;
                     firstIncluded = false;
                 } else {
                     count = count + 1;
@@ -158,6 +158,7 @@ export default class extends Controller {
                     resultList.countTarget.innerText = count;
                 }
             });
+
         }
 
         await results.forEach((list) => filterOperation(list, currentSeason));
diff --git a/assets/controllers/tv_results_controller.js b/assets/controllers/tv_results_controller.js
index 524a9f5..b2c3d4e 100644
--- a/assets/controllers/tv_results_controller.js
+++ b/assets/controllers/tv_results_controller.js
@@ -32,7 +32,10 @@ export default class extends Controller {
                 .then(response => {
                     this.element.innerHTML = response;
                     this.options = this.element.querySelectorAll('tbody tr');
-                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+                    if (this.options.length > 0) {
+                        this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+                        this.options[0].querySelector('input[type="checkbox"]').checked = true;
+                    }
                     this.optionsLoaded = true;
                     this.loadingIconOutlet.increaseCount();
                 });