diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 7af67f68..aa7c4765 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -9,11 +9,11 @@ class MapsController < ApplicationController
     @events = @events.where('start_time > ?', 360.days.ago).order :id
 
     @cities_event = @events.collect { |event|
-      City.find_by_majname event.city.gsub('-', ' ').upcase
+      event.related_city
     }.uniq.keep_if { |city| city }
 
     @cities_lug = Lug.all.collect { |lug|
-      City.find_by_majname lug.city.gsub('-', ' ').upcase
+      lug.related_city
     }.uniq.keep_if { |city| city }
   end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index e0422193..2997a892 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -32,4 +32,10 @@ class Event < ActiveRecord::Base
   def same_day?
     start_time.to_date == end_time.to_date
   end
+
+  def related_city
+    if city.present?
+      City.find_by_majname city.gsub('-', ' ').upcase
+    end
+  end
 end
diff --git a/app/models/lug.rb b/app/models/lug.rb
index 7f97906c..4a5e6230 100644
--- a/app/models/lug.rb
+++ b/app/models/lug.rb
@@ -1,3 +1,9 @@
 class Lug < ActiveRecord::Base
   belongs_to :region, foreign_key: 'region'
+
+  def related_city
+    if city.present?
+      City.find_by_majname city.gsub('-', ' ').upcase
+    end
+  end
 end
diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder
index 38687759..45dd0396 100644
--- a/app/views/events/index.rss.builder
+++ b/app/views/events/index.rss.builder
@@ -28,7 +28,7 @@ xml.tag! 'rdf:RDF', 'xmlns:rdf' => "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       xml.link event_url event
       xml.tag! 'dc:identifier', "#{event.id}@agendadulibre.org"
       xml.tag! 'dc:date', event.start_time
-      city = City.find_by_majname event.city.gsub('-', ' ').upcase
+      city = event.related_city
       xml.tag! 'georss:point', "#{city.latitude} #{city.longitude}" rescue nil
 
       @event = event
diff --git a/app/views/maps/index.html.haml b/app/views/maps/index.html.haml
index f52dfb18..0f906d8f 100644
--- a/app/views/maps/index.html.haml
+++ b/app/views/maps/index.html.haml
@@ -12,7 +12,6 @@
   :coffee
     marker = new OpenLayers.Marker(
       new OpenLayers.LonLat(#{city.longitude}, #{city.latitude})
-      #new OpenLayers.Icon(<<iconURL>>, iconSize, iconOffset)
     )
     eventsLayer.addMarker marker