diff --git a/src/tracker/grl-tracker-utils.c b/src/tracker/grl-tracker-utils.c
index 87cfe30..56913b4 100644
--- a/src/tracker/grl-tracker-utils.c
+++ b/src/tracker/grl-tracker-utils.c
@@ -365,8 +365,17 @@ grl_tracker_setup_key_mappings (void)
 tracker_grl_sparql_t *
 grl_tracker_get_mapping_from_sparql (const gchar *key)
 {
-  return (tracker_grl_sparql_t *) g_hash_table_lookup (sparql_to_grl_mapping,
-                                                       key);
+  gchar *key_tmp = g_strdup (key);
+
+  tracker_grl_sparql_t *ret = g_hash_table_lookup (sparql_to_grl_mapping,
+                                                   key_tmp);
+
+  if (ret == NULL)
+    ret = g_hash_table_lookup (sparql_to_grl_mapping,
+                               g_strdelimit (key_t, "_", "-"));
+
+  g_free (key_t);
+  return ret;
 }
 
 static GList *
