diff --git a/app/assets/javascripts/global_activities/side_pane.js b/app/assets/javascripts/global_activities/side_pane.js
index 77099c252..8698fd86a 100644
--- a/app/assets/javascripts/global_activities/side_pane.js
+++ b/app/assets/javascripts/global_activities/side_pane.js
@@ -95,7 +95,7 @@ $(function() {
     var dateContainer = $('.ga-side .date-selector.filter-block');
     if (updateRunning) return false;
     $('.ga-top .ga-tags').children().remove();
-    if (dateContainer[0].dataset.periodSelect && dateContainer[0].dataset.periodSelect !== 'null') {
+    if (dateContainer[0].dataset.periodSelect) {
       $('<li class="select2-selection__choice">'
           + dateContainer[0].dataset.periodLabel
           + $('.ga-side .date-selector.filter-block')[0].dataset.periodSelect
@@ -155,7 +155,7 @@ $(function() {
   function resetHotButtonsBackgroundColor() {
     $('.date-selector .hot-button').each(function() {
       $(this).removeClass('selected');
-    })
+    });
   }
 
   // Common selection intialize
@@ -188,7 +188,8 @@ $(function() {
     $('.ga-side .subject-selector select').select2MultipleClearAll();
     $('#calendar-from-date').data('DateTimePicker').clear();
     $('#calendar-to-date').data('DateTimePicker').clear();
-    $('.ga-side .date-selector.filter-block')[0].dataset.periodSelect = null;
+    $('.ga-side .date-selector.filter-block')[0].dataset.periodSelect = '';
+
     updateRunning = false;
     GlobalActivitiesUpdateTopPaneTags();
     reloadActivities();
@@ -201,8 +202,8 @@ $(function() {
       dateContainer[0].dataset.periodSelect = $('#calendar-from-date').val() + ' - ' + $('#calendar-to-date').val();
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
+      resetHotButtonsBackgroundColor();
     }
-    resetHotButtonsBackgroundColor();
   });
 
   $('#calendar-from-date').on('dp.change', function(e) {
@@ -212,8 +213,8 @@ $(function() {
       dateContainer[0].dataset.periodSelect = $('#calendar-from-date').val() + ' - ' + $('#calendar-to-date').val();
       GlobalActivitiesUpdateTopPaneTags();
       reloadActivities();
+      resetHotButtonsBackgroundColor();
     }
-    resetHotButtonsBackgroundColor();
   });
 
   GlobalActivitiesUpdateTopPaneTags();
diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml
index 8b3434a7d..60be853c8 100644
--- a/config/locales/global_activities/en.yml
+++ b/config/locales/global_activities/en.yml
@@ -231,4 +231,4 @@ en:
       inventories: "Inventories"
       protocol_repository: "Protocol repository"
       team: "Team"
-      exports: "Exports"
\ No newline at end of file
+      exports: "Exports"