Index: /trunk/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- /trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 26293)
+++ /trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 26294)
@@ -40,5 +40,5 @@
 
 # This determines how many entries from the list of volumes sorted by free space are randomized.
-my $topfew_count = 3;
+my $topfew_count = 15;
 
 # transaction restart/retry regex
@@ -2130,4 +2130,5 @@
             # %free, avaiable, allocate
             $rows = $query->execute(0.95, 1, 1, $topfew_count);
+#	    $log->warn("Storage_volume: $rows $topfew_count");
             # there has to be atleast one storage volume
             unless ($rows > 0) {
Index: /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm
===================================================================
--- /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 26293)
+++ /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 26294)
@@ -310,11 +310,11 @@
                    JOIN volume 
                    ON instance.vol_id = volume.vol_id
+		   WHERE so_id = (
+				  SELECT so_id
+				  FROM storage_object
+				  WHERE ext_id = ?
+				 )
                   ) AS i
             ON m.vol_id = i.vol_id
-            AND i.so_id = (
-                SELECT so_id
-                FROM storage_object
-                WHERE ext_id = ?
-            )
          WHERE
              i.vol_id IS NULL