diff --git a/packages/lektor-speaker-events/lektor_speaker_events.py b/packages/lektor-speaker-events/lektor_speaker_events.py
index 63209d13..ae3e906c 100644
--- a/packages/lektor-speaker-events/lektor_speaker_events.py
+++ b/packages/lektor-speaker-events/lektor_speaker_events.py
@@ -6,8 +6,13 @@ class SpeakerEventsPlugin(Plugin):
     name = 'Speaker Events'
     description = u'Lektor plugin that adds a function to filter events by speaker.'
 
-    def on_setup_env(self):
+    def on_setup_env(self, **extra):
         def speaker_events(eventos, speaker):
-            return [evento for evento in eventos if evento["talks"] and speaker in [talk["speaker"] for talk in evento["talks"].blocks]]
-
+            filtered = []
+            for evento in eventos:
+                if evento["talks"]:
+                    for talk in evento["talks"].blocks:
+                        if speaker in talk["speaker"]:
+                            filtered.append({"event": evento, "talk": talk})
+            return filtered
         self.env.jinja_env.filters["speakerevents"] = speaker_events
diff --git a/packages/lektor-speaker-events/setup.py b/packages/lektor-speaker-events/setup.py
index 97aa5b37..eaf7cc0d 100644
--- a/packages/lektor-speaker-events/setup.py
+++ b/packages/lektor-speaker-events/setup.py
@@ -25,7 +25,7 @@
     packages=find_packages(),
     py_modules=['lektor_speaker_events'],
     # url='[link to your repository]',
-    version='0.1',
+    version='0.2',
     classifiers=[
         'Framework :: Lektor',
         'Environment :: Plugins',
diff --git a/templates/nosotros-miembro.html b/templates/nosotros-miembro.html
index 33bbe7af..aadb3948 100644
--- a/templates/nosotros-miembro.html
+++ b/templates/nosotros-miembro.html
@@ -74,7 +74,13 @@ <h3>Charlas</h3>
       <div class="events-user row"></div>
         {% for event in eventos %}
           <div>
-            <a href="{{event|url}}">{{event.title}}</a>
+            <a href="{{event.event|url}}">
+              {% if event.talk.title %}
+                {{event.talk.title}}
+              {% else %}
+                {{event.event.title}}
+              {% endif %}  
+            </a>
           </div>
         {% endfor %}
       </div>