diff --git a/app/models/pool.rb b/app/models/pool.rb
index 8f93bc3cd..41b8c63d2 100644
--- a/app/models/pool.rb
+++ b/app/models/pool.rb
@@ -39,9 +39,8 @@ class Pool < ApplicationRecord
     end
 
     def selected_first(current_pool_id)
-      return where("true") if current_pool_id.blank?
-      current_pool_id = current_pool_id.to_i
-      reorder(Arel.sql("(case pools.id when #{current_pool_id} then 0 else 1 end), pools.name"))
+      return all if current_pool_id.blank?
+      reorder(Arel.sql("(case pools.id when #{current_pool_id.to_i} then 0 else 1 end), pools.name"))
     end
 
     def name_matches(name)
diff --git a/app/views/posts/partials/show/_nav_links.html.erb b/app/views/posts/partials/show/_nav_links.html.erb
index e0d35f04d..c2d7a56fc 100644
--- a/app/views/posts/partials/show/_nav_links.html.erb
+++ b/app/views/posts/partials/show/_nav_links.html.erb
@@ -4,7 +4,7 @@
       <%= render "posts/partials/show/search_seq", :post => post %>
     <% end %>
 
-    <% if post.pools.undeleted.any? %>
+    <% if post.pools.undeleted.present? %>
       <%= render "posts/partials/show/pool_list", post: post, pools: post.pools.undeleted.selected_first(params[:pool_id]) %>
     <% end %>