--- album.org/album.module	2005-04-15 11:56:43.000000000 -0700
+++ album/album.module	2006-02-16 13:26:11.000000000 -0800
@@ -102,7 +102,7 @@
   switch ($type) {
     case 'view':
       if (user_access('access content')) {
-        $sql = "SELECT DISTINCT(name), realm FROM {folksonomy} WHERE realm = 'album_%d' ORDER BY id DESC";
+        $sql = "SELECT DISTINCT(name), realm FROM {folksonomy} WHERE realm = 'album_%d' ORDER BY name DESC";
         $result = db_query_range($sql, $user->uid, 0, 6);
         while ($row = db_fetch_object($result)) {
           $id = substr($row->realm, strpos($row->realm, '_')+1);
@@ -155,7 +155,7 @@
 
 function album_list($uid = NULL) {
   if ($uid) {
-    $sql = "SELECT f.name AS fname, realm, u.name, u.uid, COUNT(f.name) AS fcount FROM {folksonomy} f INNER JOIN {node} n ON f.id = n.nid INNER JOIN {users} u ON n.uid = u.uid WHERE realm = 'album_%d' GROUP BY f.name, realm, u.name, u.uid ORDER BY id DESC";
+    $sql = "SELECT f.name AS fname, realm, u.name, u.uid, COUNT(f.name) AS fcount FROM {folksonomy} f INNER JOIN {node} n ON f.id = n.nid INNER JOIN {users} u ON n.uid = u.uid WHERE realm = 'album_%d' GROUP BY f.name, realm, u.name, u.uid ORDER BY f.name DESC";
     $cnt = db_num_rows(db_query("SELECT DISTINCT(name) FROM {folksonomy} WHERE realm = 'album_$uid'"));
     $sql_cnt = "SELECT $cnt";
     $result = pager_query($sql, 50, 0, $sql_cnt, $uid);
@@ -165,7 +165,7 @@
     drupal_set_title((t('%name albums', array('%name' => $account->name))));
   }
   else {
-    $sql = "SELECT f.name as fname, realm, u.name, u.uid, COUNT(f.name) AS fcount FROM {folksonomy} f INNER JOIN {node} n ON f.id = n.nid INNER JOIN {users} u ON n.uid = u.uid WHERE realm LIKE 'album_%' GROUP BY f.name, realm, u.name, u.uid ORDER BY id DESC";
+    $sql = "SELECT f.name as fname, realm, u.name, u.uid, COUNT(f.name) AS fcount FROM {folksonomy} f INNER JOIN {node} n ON f.id = n.nid INNER JOIN {users} u ON n.uid = u.uid WHERE realm LIKE 'album_%' GROUP BY f.name, realm, u.name, u.uid ORDER BY fname DESC";
     $cnt = db_num_rows(db_query("SELECT DISTINCT(name) FROM {folksonomy} WHERE realm LIKE 'album_%'"));
     $sql_cnt = "SELECT $cnt";
     $result = pager_query($sql, 50, 0, $sql_cnt);