diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass
index a20eaa57..ab46973a 100644
--- a/app/assets/stylesheets/events.css.sass
+++ b/app/assets/stylesheets/events.css.sass
@@ -9,10 +9,9 @@ header.calendar-header
     &:first-child, &:last-child
       margin: 0 0.3em
 
-.events, .event
-  .city:after
-    content: ':'
-    margin-right: -1px
+.city:after
+  content: ':'
+  margin-right: -1px
 
 body.events.index table
   width: 90%
diff --git a/app/views/events/index.ics.erb b/app/views/events/index.ics.erb
index cd35c865..a8948b1d 100644
--- a/app/views/events/index.ics.erb
+++ b/app/views/events/index.ics.erb
@@ -5,7 +5,7 @@ X-WR-CALNAME:Agenda du Libre
 X-WR-TIMEZONE:Europe/Paris
 CALSCALE:GREGORIAN
 X-WR-CALDESC:<%= t 'title', scope: [:layouts, :application] %>
-<% @events.each do |event| %>
+<% @events.find_each do |event| %>
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Paris:<%= event.start_time.strftime '%Y%m%dT%H%M%S' %>
 DTEND;TZID=Europe/Paris:<%= event.end_time.strftime '%Y%m%dT%H%M%S' %>
diff --git a/app/views/events/index.xml.builder b/app/views/events/index.xml.builder
index 0686ec1c..7ce3348a 100644
--- a/app/views/events/index.xml.builder
+++ b/app/views/events/index.xml.builder
@@ -1,7 +1,7 @@
 xml.instruct!
 
 xml.events do
-  @events.each do |event|
+  @events.find_each do |event|
     xml.event do
       xml.title event.title
       xml.start_time event.start_time.strftime '%Y/%m/%d %T'
diff --git a/app/views/regions/_selector.haml b/app/views/regions/_selector.haml
index 69b80053..e1f2a62f 100644
--- a/app/views/regions/_selector.haml
+++ b/app/views/regions/_selector.haml
@@ -17,9 +17,9 @@
         year: params[:year],
         tag: params[:tag]
 
-    - Region.all.each do |region|
+    - Region.pluck(:id, :name).each do |id, name|
       %li
-        = link_to region, region: region.id,
+        = link_to name, region: id,
           start_date: params[:start_date],
           year: params[:year],
           tag: params[:tag]
diff --git a/app/views/regions/index.html.haml b/app/views/regions/index.html.haml
index a7bca52a..989d8d7f 100644
--- a/app/views/regions/index.html.haml
+++ b/app/views/regions/index.html.haml
@@ -13,7 +13,7 @@
       %th= link_to :iCal, events_path(format: :ics, region: :all, only_path: false)
 
   %tbody
-    - @regions.each do |region|
+    - @regions.find_each do |region|
       %tr
         %td= region.name
         %td= link_to 'RSS', events_path(format: :rss, region: region.id)
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 7ddc5c63..dc3b4aa3 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -4,9 +4,12 @@
 
 %p=raw t '.future', count: @events_future.count
 %ul
-  - @events_future.each do |event|
+  - @events_future.find_each do |event|
     %li
-      %div= link_to event.title, event
+      %div
+        = link_to event do
+          %em.city= event.city
+          = event.title
       - if event.same_day?
         le
         =l event.start_time.to_date, format: :long
@@ -15,14 +18,15 @@
         =l event.start_time.to_date, format: :long
         au
         =l event.end_time.to_date, format: :long
-      à
-      = event.city
 
 %p=raw t '.past', count: @events_past.count
 %ul
-  - @events_past.each do |event|
+  - @events_past.find_each do |event|
     %li
-      %div= link_to event.title, event
+      %div
+        = link_to event do
+          %em.city= event.city
+          = event.title
       - if event.same_day?
         le
         =l event.start_time.to_date, format: :long
@@ -31,5 +35,3 @@
         =l event.start_time.to_date, format: :long
         au
         =l event.end_time.to_date, format: :long
-      à
-      = event.city