diff --git a/app/models/event.rb b/app/models/event.rb
index 2b8e864..9c978a1 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -102,20 +102,19 @@ class Event < Article
     html = Builder::XmlMarkup.new(:target => result)
 
     html.div(:class => 'event-info' ) {
-
       html.ul(:class => 'event-data' ) {
         html.li(:class => 'event-dates' ) {
           html.span _('When:')
           html.text! show_period(start_date, end_date)
-        }
+        } if start_date.present? || end_date.present?
         html.li {
           html.span _('URL:')
           html.a(self.link || "", 'href' => self.link || "")
-        }
+        } if self.link.present?
         html.li {
           html.span _('Address:')
           html.text! self.address || ""
-        }
+        } if self.address.present?
       }
 
       # TODO: some good soul, please clean this ugly hack:
--
libgit2 0.21.2