diff --git a/src/client/manager/js/app/components/appointments/AppointmentSelectTable.js b/src/client/manager/js/app/components/appointments/AppointmentSelectTable.js
index 50fbedb..4a16b98 100644
--- a/src/client/manager/js/app/components/appointments/AppointmentSelectTable.js
+++ b/src/client/manager/js/app/components/appointments/AppointmentSelectTable.js
@@ -111,6 +111,7 @@ const AppointmentSelectTable = {
             table.draw();
         });
 
+        // Add eventhandler for datepickers
         $.fn.dataTable.ext.search.push(
             function(settings, searchData, index, rowData, counter) {
                 const dateFrom = $('input.dateStart').val();
@@ -119,12 +120,22 @@ const AppointmentSelectTable = {
                 const startDate = item['start_dt'];
                 const strStartDate = startDate.date.substring(0,10);
 
+                if (dateFrom === '' && dateTo === '') {
+                    return true;
+                }
+                if (dateFrom !== '' && dateTo === '') {
+                    return strStartDate >= dateFrom;
+                }
+                if (dateFrom === '' && dateTo !== '') {
+                    return strStartDate <= dateTo;
+                }
                 if (strStartDate >= dateFrom && strStartDate <= dateTo) {
                     return true;
                 }
                 return false;
             }
         );
+
         // Initial drawing needed to filter by date interval
         table.draw();
     },
@@ -144,7 +155,8 @@ const AppointmentSelectTable = {
 
     destroy : function()
     {
-
+        // Remove eventhandler for datepickers
+        $.fn.dataTable.ext.search.pop();
     }
 };
 
diff --git a/src/client/manager/js/app/views/appointments/AppointmentList.js b/src/client/manager/js/app/views/appointments/AppointmentList.js
index 40e6a47..ff5a78d 100644
--- a/src/client/manager/js/app/views/appointments/AppointmentList.js
+++ b/src/client/manager/js/app/views/appointments/AppointmentList.js
@@ -61,7 +61,7 @@ const AppointmentList = {
 
 
 
-                            let compAst = this.createComponent(
+                            self.compAst = this.createComponent(
                                 'appointment-select-table',
                                 $container.find( '[f-id="container-appointment-data-table"]' ).first().get( 0 ),
                                 apps
@@ -134,7 +134,7 @@ const AppointmentList = {
 
     destroy : function()
     {
-
+        self.compAst.destroy();
     }
 };