--- a/src/p4l/views.py	Mon Sep 09 18:01:47 2013 +0200
+++ b/src/p4l/views.py	Mon Sep 09 18:41:32 2013 +0200
@@ -125,20 +125,23 @@
         uri_labels.update(get_labels_for_uris([self.object.recordType] if self.object.recordType else [], "http://www.iiep.unesco.org/plan4learning/scheme/DocumentType", lang, False))
         context['uri_labels'] = json.dumps(uri_labels)
         
-        context['subjects_query_dict'] = json.dumps({
-                            'dataurl': settings.SPARQL_QUERY_ENDPOINT,
-                            'dataquery': settings.SPARQL_SUBJECT_QUERIES["filter"],
-                            'datarootquery': settings.SPARQL_SUBJECT_QUERIES["root"],
-                            'datachildsquery': settings.SPARQL_SUBJECT_QUERIES["childs"],
-                            'datachildcountquery': settings.SPARQL_SUBJECT_QUERIES["child-count"]
-                            })
-        context['themes_query_dict'] = json.dumps({
-                            'dataurl': settings.SPARQL_QUERY_ENDPOINT,
-                            'dataquery': settings.SPARQL_THEME_QUERIES["filter"],
-                            'datarootquery': settings.SPARQL_THEME_QUERIES["root"],
-                            'datachildsquery': settings.SPARQL_THEME_QUERIES["childs"],
-                            'datachildcountquery': settings.SPARQL_THEME_QUERIES["child-count"]
-                            })
+        query_dicts = {
+            'subjects': {
+                'dataurl': settings.SPARQL_QUERY_ENDPOINT,
+                'dataquery': settings.SPARQL_SUBJECT_QUERIES["filter"],
+                'datarootquery': settings.SPARQL_SUBJECT_QUERIES["root"],
+                'datachildsquery': settings.SPARQL_SUBJECT_QUERIES["childs"],
+                'datachildcountquery': settings.SPARQL_SUBJECT_QUERIES["child-count"]
+            },
+            'themes' : {
+                'dataurl': settings.SPARQL_QUERY_ENDPOINT,
+                'dataquery': settings.SPARQL_THEME_QUERIES["filter"],
+                'datarootquery': settings.SPARQL_THEME_QUERIES["root"],
+                'datachildsquery': settings.SPARQL_THEME_QUERIES["childs"],
+                'datachildcountquery': settings.SPARQL_THEME_QUERIES["child-count"]
+            }
+        }
+        context['query_dicts'] = json.dumps(query_dicts)
         
         return context