diff --git a/app/models/event.rb b/app/models/event.rb
index 1d023fbc..0ef4c44e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -82,10 +82,10 @@ class Event < ActiveRecord::Base
   end
 
   def as_json(_options = {})
-    popup = "<a href=\"/#{self.class.name.downcase.pluralize}/#{id}\""
-    popup += " >#{start_time.to_date} #{city}: #{title}</a>"
     { type: 'Feature', properties: {
-      id: id, name: title, tags: tags, popupContent: popup
+      id: id, name: title, tags: tags,
+      popupContent: "<a href=\"/events/#{id}\">#{self}</a>",
+      start_time: start_time, end_time: end_time, locality: locality
     }, geometry: {
       type: 'Point', coordinates: [longitude, latitude]
     } }