diff --git a/src/Event.vala b/src/Event.vala
index cbc3485..68c22a5 100644
--- a/src/Event.vala
+++ b/src/Event.vala
@@ -568,23 +568,7 @@ public class Event : EventSource, ContainerSource, Proxyable, Indexable {
     }
     
     private void update_indexable_keywords() {
-        string[] components = new string[3];
-        int i = 0;
-
-        string? rawname = get_raw_name();
-        if (rawname != null)
-            components[i++] = rawname;
-
-        string? comment = get_comment();
-        if (comment != null)
-            components[i++] = comment;
-
-        if (i == 0)
-            indexable_keywords = null;
-        else {
-            components[i] = null;
-            indexable_keywords = prepare_indexable_string(string.joinv(" ", components));
-        }
+        indexable_keywords = prepare_indexable_string(get_raw_name());
     }
     
     public unowned string? get_indexable_keywords() {