diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php
index 541036e0..bd008068 100644
--- a/application/controllers/Calendar.php
+++ b/application/controllers/Calendar.php
@@ -584,9 +584,11 @@ class Calendar extends EA_Controller {
                 throw new Exception('You do not have the required permissions for this task.');
             }
 
+            $record_id = request('record_id');
+            
             $filter_type = request('filter_type');
 
-            if ( ! $filter_type)
+            if ( ! $filter_type && $record_id !== 'all')
             {
                 json_response([
                     'appointments' => [],
@@ -596,17 +598,20 @@ class Calendar extends EA_Controller {
                 return;
             }
 
+            $record_id = $this->db->escape($record_id);
+
             if ($filter_type == FILTER_TYPE_PROVIDER)
             {
                 $where_id = 'id_users_provider';
             }
-            else
+            elseif ($filter_type === FILTER_TYPE_SERVICE)
             {
                 $where_id = 'id_services';
+            } else {
+                $where_id = $record_id;
             }
 
             // Get appointments
-            $record_id = $this->db->escape(request('record_id'));
             $start_date = $this->db->escape(request('start_date'));
             $end_date = $this->db->escape(date('Y-m-d', strtotime(request('end_date') . ' +1 day')));
 
diff --git a/application/language/arabic/translations_lang.php b/application/language/arabic/translations_lang.php
index bf0c0d78..87371b80 100755
--- a/application/language/arabic/translations_lang.php
+++ b/application/language/arabic/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/bulgarian/translations_lang.php b/application/language/bulgarian/translations_lang.php
index 08f68ba8..024650d3 100755
--- a/application/language/bulgarian/translations_lang.php
+++ b/application/language/bulgarian/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/catalan/translations_lang.php b/application/language/catalan/translations_lang.php
index 16831f76..585d069c 100644
--- a/application/language/catalan/translations_lang.php
+++ b/application/language/catalan/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/chinese/translations_lang.php b/application/language/chinese/translations_lang.php
index 8cb2958f..6aaa104f 100755
--- a/application/language/chinese/translations_lang.php
+++ b/application/language/chinese/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/czech/translations_lang.php b/application/language/czech/translations_lang.php
index 2f402492..bf9dc724 100644
--- a/application/language/czech/translations_lang.php
+++ b/application/language/czech/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/danish/translations_lang.php b/application/language/danish/translations_lang.php
index 45a3cd5d..c0e1201b 100755
--- a/application/language/danish/translations_lang.php
+++ b/application/language/danish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/dutch/translations_lang.php b/application/language/dutch/translations_lang.php
index d0378c1f..9c8ae405 100755
--- a/application/language/dutch/translations_lang.php
+++ b/application/language/dutch/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/english/translations_lang.php b/application/language/english/translations_lang.php
index b385c09f..7869c791 100755
--- a/application/language/english/translations_lang.php
+++ b/application/language/english/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/finnish/translations_lang.php b/application/language/finnish/translations_lang.php
index 9623750b..e5dc699d 100755
--- a/application/language/finnish/translations_lang.php
+++ b/application/language/finnish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/french/translations_lang.php b/application/language/french/translations_lang.php
index 82b8b289..1a0e3693 100755
--- a/application/language/french/translations_lang.php
+++ b/application/language/french/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/greek/translations_lang.php b/application/language/greek/translations_lang.php
index d8613a8c..75724f6b 100755
--- a/application/language/greek/translations_lang.php
+++ b/application/language/greek/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/hebrew/translations_lang.php b/application/language/hebrew/translations_lang.php
index 5405fca7..67d21837 100644
--- a/application/language/hebrew/translations_lang.php
+++ b/application/language/hebrew/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/hindi/translations_lang.php b/application/language/hindi/translations_lang.php
index dc070d4b..ff009707 100755
--- a/application/language/hindi/translations_lang.php
+++ b/application/language/hindi/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/hungarian/translations_lang.php b/application/language/hungarian/translations_lang.php
index 0c6f9ab3..bc2d07ab 100755
--- a/application/language/hungarian/translations_lang.php
+++ b/application/language/hungarian/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/italian/translations_lang.php b/application/language/italian/translations_lang.php
index 593ef852..ffc5cfa8 100755
--- a/application/language/italian/translations_lang.php
+++ b/application/language/italian/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/japanese/translations_lang.php b/application/language/japanese/translations_lang.php
index e646d8d9..53b824f7 100755
--- a/application/language/japanese/translations_lang.php
+++ b/application/language/japanese/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/luxembourgish/translations_lang.php b/application/language/luxembourgish/translations_lang.php
index abd6e1d8..99daedf4 100755
--- a/application/language/luxembourgish/translations_lang.php
+++ b/application/language/luxembourgish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/marathi/translations_lang.php b/application/language/marathi/translations_lang.php
index 5f0659d5..c7a946fa 100644
--- a/application/language/marathi/translations_lang.php
+++ b/application/language/marathi/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/polish/translations_lang.php b/application/language/polish/translations_lang.php
index 76a91aea..c18d2f4a 100755
--- a/application/language/polish/translations_lang.php
+++ b/application/language/polish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/portuguese-br/translations_lang.php b/application/language/portuguese-br/translations_lang.php
index 69c0de1c..e3620e6c 100755
--- a/application/language/portuguese-br/translations_lang.php
+++ b/application/language/portuguese-br/translations_lang.php
@@ -359,4 +359,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/portuguese/translations_lang.php b/application/language/portuguese/translations_lang.php
index 53a10a61..f906d3c2 100755
--- a/application/language/portuguese/translations_lang.php
+++ b/application/language/portuguese/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/romanian/translations_lang.php b/application/language/romanian/translations_lang.php
index 753d4fa0..caf9493a 100755
--- a/application/language/romanian/translations_lang.php
+++ b/application/language/romanian/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/russian/translations_lang.php b/application/language/russian/translations_lang.php
index 57c7fe8d..ae03d629 100755
--- a/application/language/russian/translations_lang.php
+++ b/application/language/russian/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/slovak/translations_lang.php b/application/language/slovak/translations_lang.php
index 34ec399b..3caf7aeb 100755
--- a/application/language/slovak/translations_lang.php
+++ b/application/language/slovak/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/spanish/translations_lang.php b/application/language/spanish/translations_lang.php
index afa7dd8d..2caa7c29 100755
--- a/application/language/spanish/translations_lang.php
+++ b/application/language/spanish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/swedish/translations_lang.php b/application/language/swedish/translations_lang.php
index 075ac2b8..42ed281c 100644
--- a/application/language/swedish/translations_lang.php
+++ b/application/language/swedish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/application/language/turkish/translations_lang.php b/application/language/turkish/translations_lang.php
index 29a4f877..f1a7f38d 100755
--- a/application/language/turkish/translations_lang.php
+++ b/application/language/turkish/translations_lang.php
@@ -360,4 +360,5 @@ $lang['display_login_button_hint'] = 'Defines whether the login button is being
 $lang['private'] = 'Private';
 $lang['private_hint'] = 'Private records will not be displayed or processed in public pages such as the booking page.';
 $lang['reset'] = 'Reset';
+$lang['all'] = 'All';
 // End
diff --git a/assets/js/utils/calendar_default_view.js b/assets/js/utils/calendar_default_view.js
index a996b73d..e1e11656 100755
--- a/assets/js/utils/calendar_default_view.js
+++ b/assets/js/utils/calendar_default_view.js
@@ -1542,6 +1542,8 @@ App.Utils.CalendarDefaultView = (function () {
         // Trigger once to set the proper footer position after calendar initialization.
         onWindowResize();
 
+        $selectFilterItem.append(new Option(lang('all'), 'all', true, true));
+
         // Fill the select list boxes of the page.
         if (vars('available_providers').length > 0) {
             $('<optgroup/>', {