diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index a3ac9eb9..fea32f49 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -12,8 +12,7 @@ class EventsController < ApplicationController
     respond_to do |format|
       format.html
       format.rss do
-        @events = @events.future_30.includes :related_city
-        @events = @events.limit params[:daylimit] if params[:daylimit]
+        @events = @events.includes(:related_city).future params[:daylimit]
       end
       format.ics { @events = @events.last_year.order :id }
       format.xml { @events = @events.includes(:related_region).order :id }
diff --git a/app/models/event.rb b/app/models/event.rb
index 93757650..23ee1abc 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -25,8 +25,10 @@ class Event < ActiveRecord::Base
   scope :future, (lambda do
     where('end_time >= ?', DateTime.now).order start_time: :asc
   end)
-  scope :future_30, (lambda do
-    where('start_time >= ? and end_time <= ?', DateTime.now, 30.days.from_now)
+  scope :future, (lambda do |days|
+    days ||= '30'
+    where('? <= start_time and end_time <= ?',
+          DateTime.now, days.to_i.days.from_now)
     .order :start_time
   end)
   scope :year, (lambda do |year|