diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php
index 8686e0b..63928c6 100644
--- a/resources/views/staff/worklist/index.blade.php
+++ b/resources/views/staff/worklist/index.blade.php
@@ -138,10 +138,9 @@ function generateUrl() {
                 altInput: true,
                 altFormat: "j M (D)",
                 disable: [
-                    function (givenDate) {
-                        const today = new Date();
-                        const maxDate = new Date(today);
-                        maxDate.setDate(today.getDate() + 1);
+                    givenDate => {
+                        const maxDate = new Date();
+                        maxDate.setDate(maxDate.getDate() + 1);
                         return givenDate > maxDate;
                     }
                 ]
@@ -155,29 +154,20 @@ function (givenDate) {
             $('#search_button').on('click', function () {
                 resetParams();
 
-                const study_range = fp_study.selectedDates;
-                if (study_range.length == 2) {
-                    _study_from = formatDate(study_range[0]);
-                    _study_to = formatDate(study_range[1]);
-                }
+                const ranges = [
+                    {picker: fp_study, from: '_study_from', to: '_study_to'},
+                    {picker: fp_receive, from: '_receive_from', to: '_receive_to'},
+                    {picker: fp_assign, from: '_assign_from', to: '_assign_to'},
+                    {picker: fp_read, from: '_read_from', to: '_read_to'}
+                ];
 
-                const receive_range = fp_receive.selectedDates;
-                if (receive_range.length == 2) {
-                    _receive_from = formatDate(receive_range[0]);
-                    _receive_to = formatDate(receive_range[1]);
-                }
-
-                const assign_range = fp_assign.selectedDates;
-                if (assign_range.length == 2) {
-                    _assign_from = formatDate(assign_range[0]);
-                    _assign_to = formatDate(assign_range[1]);
-                }
-
-                const read_range = fp_read.selectedDates;
-                if (read_range.length == 2) {
-                    _read_from = formatDate(read_range[0]);
-                    _read_to = formatDate(read_range[1]);
-                }
+                ranges.forEach(range => {
+                    const selectedDates = range.picker.selectedDates;
+                    if (selectedDates.length === 2) {
+                        window[range.from] = formatDate(selectedDates[0]);
+                        window[range.to] = formatDate(selectedDates[1]);
+                    }
+                });
 
                 const modalityArray = [];
                 @foreach ($modalities as $modality)