diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 07ee66ea..14bd063a 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -14,8 +14,8 @@ class EventsController < ApplicationController
   def index
     respond_to do |format|
       format.html
-      format.json { @events = @events.future }
       format.ics { @events = @events.future }
+      format.json { @events = @events.future }
       format.rss { @events = filter_for_rss }
       format.xml
     end
diff --git a/app/models/event.rb b/app/models/event.rb
index 9fcbd87e..a0b9540d 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -44,7 +44,6 @@ class Event < ApplicationRecord
 
   scope :moderated, ->(*) { where moderated: true }
   scope :unmoderated, ->(*) { where moderated: false }
-  scope :last_year, -> { where '? <= end_time', 1.year.ago }
   scope :past, -> { where 'start_time <= ?', Time.zone.now }
   scope :future, -> { where '? <= end_time', Time.zone.now }
   scope :daylimit, ->(nb) { where 'end_time <= ?', nb.to_i.days.from_now }
diff --git a/app/views/events/_event.haml b/app/views/events/_event.haml
index 7d115961..549f2376 100644
--- a/app/views/events/_event.haml
+++ b/app/views/events/_event.haml
@@ -6,5 +6,5 @@
   = link_to event do
     %strong.city{ title: event.address }= event.city
     = event.title
-    - if event.repeat > 0
+    - if event.repeat.positive?
       %em.fa.fa-repeat{ title: event.schedule }
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 49f67456..29d236fd 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -21,13 +21,13 @@
 
 - else
   -# One month calendar
-  - params[:start_date] ||= Time.zone.today.beginning_of_month
   :ruby
+    params[:start_date] ||= Time.zone.today.beginning_of_month
     set_meta_tags(
       prev: url_for(start_date: params[:start_date].to_date - 1.month),
       next: url_for(start_date: params[:start_date].to_date + 1.month)
     )
-  - @events = @events.month params[:start_date]
+    @events = @events.month params[:start_date]
   = month_calendar events: @events do |date, events|
     - capture_haml do
       .day_number= date.day