--- a/Controller/WikiTagController.php	Fri Nov 04 15:59:49 2011 +0100
+++ b/Controller/WikiTagController.php	Fri Nov 04 16:42:01 2011 +0100
@@ -596,16 +596,18 @@
             $sort = "popd"; // sort by descendent popularity by default.
             $reverse_sort = "popa";
         }
-        $sort_query = "t.popularity DESC t.normalizedLabel ASC t.label ASC";
+        //$sort_query = "nb_docs DESC t.popularity DESC t.normalizedLabel ASC t.label ASC";
         switch($sort){
             case "popd":
                 $qb->addOrderBy('t.popularity','DESC');
+                $qb->addOrderBy('nb_docs','DESC');
                 $qb->addOrderBy('t.normalizedLabel','ASC');
                 $qb->addOrderBy('t.label','ASC');
                 $reverse_sort = "popa";
                 break;
             case "popa":
                 $qb->addOrderBy('t.popularity','ASC');
+                $qb->addOrderBy('nb_docs','DESC');
                 $qb->addOrderBy('t.normalizedLabel','ASC');
                 $qb->addOrderBy('t.label','ASC');
                 $reverse_sort = "popd";
@@ -619,6 +621,19 @@
                 $qb->addOrderBy('t.normalizedLabel','ASC');
                 $qb->addOrderBy('t.label','ASC');
                 $reverse_sort = "labd";
+            case "nbd":
+                $qb->addOrderBy('nb_docs','DESC');
+                $qb->addOrderBy('t.popularity','DESC');
+                $qb->addOrderBy('t.normalizedLabel','ASC');
+                $qb->addOrderBy('t.label','ASC');
+                $reverse_sort = "nba";
+                break;
+            case "nba":
+                $qb->addOrderBy('nb_docs','ASC');
+                $qb->addOrderBy('t.popularity','DESC');
+                $qb->addOrderBy('t.normalizedLabel','ASC');
+                $qb->addOrderBy('t.label','ASC');
+                $reverse_sort = "nbd";
                 break;
         }