--- a/src/hdalab/views/profile.py	Wed Aug 27 13:11:28 2014 +0200
+++ b/src/hdalab/views/profile.py	Wed Aug 27 13:16:18 2014 +0200
@@ -172,10 +172,9 @@
             })
             
             # Get translated labels
-            dbpediafields = dict([(df.tag_id, df) for df in DbpediaFields.objects.filter(tag__in = [ot.tag for ot in ordered_tags])])
             translations = {}
             if lang not in no_translate_langs:
-                transqs = DbpediaFieldsTranslation.objects.filter(master__in = dbpediafields.values(), language_code = lang)
+                transqs = DbpediaFieldsTranslation.objects.filter(master__in = [ot.tag.dbpedia_fields if hasattr(ot.tag, 'dbpedia_fields') and ot.tag.dbpedia_fields else None for ot in ordered_tags], language_code = lang)
                 translations = dict([(trans.master_id,trans.label) for trans in transqs])
             
             for ot in ordered_tags:
@@ -186,7 +185,7 @@
                 
                 content["nodes"].append({
                   "id": unicode(uuid.uuid1()),
-                  "title": translations.get(dbpediafields[t.id].id, t.label),
+                  "title": translations.get(t.dbpedia_fields.id, t.label) if hasattr(t, 'dbpedia_fields') and t.dbpedia_fields else t.label,
                   "description": t.dbpedia_uri,
                   "uri": t.dbpedia_uri,
                   "position": np.get_place("tags"),