diff --git a/app/helpers/dragnet/optimal_index_storage_helper.rb b/app/helpers/dragnet/optimal_index_storage_helper.rb
index 47d59afa..3e67b755 100644
--- a/app/helpers/dragnet/optimal_index_storage_helper.rb
+++ b/app/helpers/dragnet/optimal_index_storage_helper.rb
@@ -194,8 +194,8 @@ def optimal_index_storage
        ) cs ON cs.Index_Owner = i.Owner AND cs.Index_Name = i.Index_Name
 LEFT OUTER JOIN ash ON ash.Owner = i.Owner AND ash.Object_Name = i.Index_Name
 WHERE  i.Compression != 'ADVANCED HIGH'
-AND    NVL(ash.Seconds_In_Wait, 0) < ?
 AND    seg.MBytes > ?
+AND    NVL(ash.Seconds_In_Wait, 0) < ?
 ORDER BY seg.MBytes DESC NULLS LAST
           ",
           :parameter=>[
diff --git a/config/application.rb b/config/application.rb
index 74893c3b..d2dbe9b3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,8 +10,8 @@
 
 module Panorama
   # VERSION and RELEASE_DATE should have fix syntax and positions because they are parsed from other sites
-  VERSION = '2.17.03'
-  RELEASE_DATE = Date.parse('2023-05-22')
+  VERSION = '2.17.04'
+  RELEASE_DATE = Date.parse('2023-05-24')
 
   RELEASE_DAY   = "%02d" % RELEASE_DATE.day
   RELEASE_MONTH = "%02d" % RELEASE_DATE.month