--- a/web/hdalab/views/ajax.py	Tue Feb 28 11:43:29 2012 +0100
+++ b/web/hdalab/views/ajax.py	Tue Feb 28 18:51:58 2012 +0100
@@ -138,15 +138,15 @@
                 globalids += [t.id for t in taglblqs if t.id not in globalids]
                 contentqs = contentqs.filter(taggedsheet__tag__in = taglblqs,
                                taggedsheet__order__lte = max_tag_order)
-
+        if contentlist:
+            contentqs = contentqs.filter(id__in = contentlist.split(","))
+            
         tagqs = tagqs.filter(datasheet__in = contentqs)
         countryqs = countryqs.filter(includes__tag__taggedsheet__datasheet__in = contentqs)
         discqs = discqs.filter(datasheet__in = contentqs)
         yearqs = yearqs.filter(tag__taggedsheet__datasheet__in = contentqs)
         
-    if contentlist is not None:
-        contentqs = contentqs.filter(id__in = contentlist.split(","))
-    else:
+    if contentlist is None:
         contentqs.order_by('?')
             
     cont_count = contentqs.count()
@@ -184,7 +184,7 @@
     yearqs = yearqs.annotate(nb=Count('tag__taggedsheet'))
     for ty in yearqs:
         for year in range(ty.start_year, ty.end_year):
-            years[year] = ty.nb + years[year] if year in years else 0
+            years[year] = ty.nb + (years[year] if year in years else 0)
             
     yearchange = []
     for year in sorted(years.keys()):