diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb
index cb023cdf4..a517edc84 100644
--- a/app/controllers/concerns/commentable_actions.rb
+++ b/app/controllers/concerns/commentable_actions.rb
@@ -98,8 +98,22 @@ module CommentableActions
     end
 
     def search_start_date
-      date = Date.parse(params[:advanced_search][:date_min]) rescue nil
-      date || eval(params[:advanced_search][:date_min]).to_date
+      case params[:advanced_search][:date_min]
+      when '1'
+        24.hours.ago
+      when '2'
+        1.week.ago
+      when '3'
+        1.month.ago
+      when '4'
+        1.year.ago
+      else
+        Date.parse(params[:advanced_search][:date_min]) rescue nil
+      end
+    end
+
+    def method_name
+
     end
 
     def search_finish_date
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index eb027aae3..3d30ce101 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -12,10 +12,10 @@ module SearchHelper
 
   def date_range_options
     options_for_select([
-      [t("shared.advanced_search.date_1"), "24.hours.ago"],
-      [t("shared.advanced_search.date_2"), "1.week.ago"],
-      [t("shared.advanced_search.date_3"), "30.days.ago"],
-      [t("shared.advanced_search.date_4"), "1.year.ago"],
+      [t("shared.advanced_search.date_1"), 1],
+      [t("shared.advanced_search.date_2"), 2],
+      [t("shared.advanced_search.date_3"), 3],
+      [t("shared.advanced_search.date_4"), 4],
       [t("shared.advanced_search.date_5"), 'custom']],
       selected_date_range)
   end